Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jul 2011 21:54:02 +0000 (14:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jul 2011 21:54:02 +0000 (14:54 -0700)
commitacb41c0f928fdb84a1c3753ac92c534a2a0f08d2
tree4bf92f1c2b1f36fa68d3e77d646b04b863e1a7e4
parent8181780c163e7111f15619067cfa044172d532e1
parentef3b4f8cc20e80c767e47b848fb7512770ab80d7
Merge branch 'of-pci' of git://git./linux/kernel/git/benh/powerpc

* 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  pci/of: Consolidate pci_bus_to_OF_node()
  pci/of: Consolidate pci_device_to_OF_node()
  x86/devicetree: Use generic PCI <-> OF matching
  microblaze/pci: Move the remains of pci_32.c to pci-common.c
  microblaze/pci: Remove powermac originated cruft
  pci/of: Match PCI devices to OF nodes dynamically
arch/sparc/include/asm/pci_32.h
arch/x86/kernel/devicetree.c
drivers/pci/Makefile
drivers/pci/probe.c