diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-13 06:21:01 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-13 06:21:01 +0400 |
| commit | 619b5891903936f3e493bf8cda18a8b6664fcdd7 (patch) | |
| tree | 58472edc2ba7fc7319a139f7903913892cb7603f /block/blk-cgroup.c | |
| parent | 19726630c69eb373d6d5d4f3934c2ed540914344 (diff) | |
| parent | 1f53ba6e81749a420226e5502c49ab83ba85c81d (diff) | |
| download | linux-619b5891903936f3e493bf8cda18a8b6664fcdd7.tar.xz | |
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 'block/blk-cgroup.c')
0 files changed, 0 insertions, 0 deletions