diff options
| author | Linus Torvalds <[email protected]> | 2011-07-22 21:54:02 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-07-22 21:54:02 +0000 |
| commit | acb41c0f928fdb84a1c3753ac92c534a2a0f08d2 (patch) | |
| tree | 4bf92f1c2b1f36fa68d3e77d646b04b863e1a7e4 /net/tipc/node.c | |
| parent | Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| parent | pci/of: Consolidate pci_bus_to_OF_node() (diff) | |
| download | kernel-acb41c0f928fdb84a1c3753ac92c534a2a0f08d2.tar.gz kernel-acb41c0f928fdb84a1c3753ac92c534a2a0f08d2.zip | |
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
Diffstat (limited to 'net/tipc/node.c')
0 files changed, 0 insertions, 0 deletions