]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/char/specialix.c
projects / mv-sheeva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 50de1dd e528db5)
Merge branch 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jan 2011 02:44:52 +0000 (18:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Jan 2011 02:44:52 +0000 (18:44 -0800)
commit2c0076d8c7eb1dafa03d0a792444862080b34106
tree93e1b6194b05b3c1c5c30ddece52484f48a61229tree | snapshot
parent50de1dd967d4ba3b8a90ebe7a4f5feca24191317commit | diff
parente528db5b392ab2a624258a667fed0e65af6e411bcommit | 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.
drivers/xen/Kconfig diff1 | diff2 | blob | history
Linux for Marvell Sheeva based platforms