tree 93e1b6194b05b3c1c5c30ddece52484f48a61229
parent 50de1dd967d4ba3b8a90ebe7a4f5feca24191317
parent e528db5b392ab2a624258a667fed0e65af6e411b
author Linus Torvalds <torvalds@linux-foundation.org> 1294973092 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294973092 -0800

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.