aboutsummaryrefslogtreecommitdiffstats
path: root/include/xen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 18:44:52 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 18:44:52 -0800
commit2c0076d8c7eb1dafa03d0a792444862080b34106 (patch)
tree93e1b6194b05b3c1c5c30ddece52484f48a61229 /include/xen
parentmemcg: fix memory migration of shmem swapcache (diff)
parentxen-platform: Fix compile errors if CONFIG_PCI is not enabled. (diff)
downloadlinux-dev-2c0076d8c7eb1dafa03d0a792444862080b34106.tar.xz
linux-dev-2c0076d8c7eb1dafa03d0a792444862080b34106.zip
Merge branch 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen-platform: Fix compile errors if CONFIG_PCI is not enabled. xen: rename platform-pci module to xen-platform-pci. xen-platform: use PCI interfaces to request IO and MEM resources.
Diffstat (limited to 'include/xen')
0 files changed, 0 insertions, 0 deletions