diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-13 11:21:01 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-13 11:21:01 +0900 |
| commit | 619b5891903936f3e493bf8cda18a8b6664fcdd7 (patch) | |
| tree | 58472edc2ba7fc7319a139f7903913892cb7603f /lib/test-string_helpers.c | |
| parent | Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | arm64: introduce virt_to_pfn (diff) | |
| download | wireguard-linux-619b5891903936f3e493bf8cda18a8b6664fcdd7.tar.xz wireguard-linux-619b5891903936f3e493bf8cda18a8b6664fcdd7.zip | |
Merge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen bug fixes from David Vrabel:
- Fix arm64 crash on boot.
- Quiet a noisy arm build warning (virt_to_pfn() redefined).
* tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
arm64: introduce virt_to_pfn
xen/events/fifo: correctly align bitops
arm/xen: Remove definiition of virt_to_pfn in asm/xen/page.h
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions