| commit | 2c0076d8c7eb1dafa03d0a792444862080b34106 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 13 18:44:52 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 13 18:44:52 2011 -0800 |
| tree | 93e1b6194b05b3c1c5c30ddece52484f48a61229 | |
| parent | 50de1dd967d4ba3b8a90ebe7a4f5feca24191317 [diff] | |
| parent | e528db5b392ab2a624258a667fed0e65af6e411b [diff] |
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.