Messages in this thread | | | Date | Tue, 26 Jul 2011 11:46:15 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the microblaze tree with Linus' tree |
| |
Hi Michal,
Today's linux-next merge of the microblaze tree got a conflict in arch/microblaze/pci/pci_32.c between commit 98d9f30c820d ("pci/of: Match PCI devices to OF nodes dynamically") from Linus' tree and commit c9d761b7c4b6 ("microblaze: PCI fix typo fault in of_node pointer moving into pci_bus") from the microblaze tree.
The former removed the line fixed up by the latter. The file was then removed in a later commit, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |