From: Linus Torvalds Date: Fri, 22 Jul 2011 21:54:02 +0000 (-0700) Subject: Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc X-Git-Tag: v3.1-rc1~310 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acb41c0f928fdb84a1c3753ac92c534a2a0f08d2;p=pandora-kernel.git 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 --- acb41c0f928fdb84a1c3753ac92c534a2a0f08d2 Reading git-diff-tree failed