| commit | acb41c0f928fdb84a1c3753ac92c534a2a0f08d2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 22 14:54:02 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 22 14:54:02 2011 -0700 |
| tree | 4bf92f1c2b1f36fa68d3e77d646b04b863e1a7e4 | |
| parent | 8181780c163e7111f15619067cfa044172d532e1 [diff] | |
| parent | ef3b4f8cc20e80c767e47b848fb7512770ab80d7 [diff] |
Merge branch 'of-pci' of git://git.kernel.org/pub/scm/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