Messages in this thread | | | Date | Mon, 27 Feb 2012 11:31:29 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pci tree with the mips tree |
| |
Hi Jesse,
Today's linux-next merge of the pci tree got a conflict in arch/mips/pci/pci.c between commit f79eaeb10849 ("MIPS: PCI: use list_for_each_entry() for bus->devices traversal") from the mips tree and commit 96a6b9ad05a2 ("mips/PCI: get rid of device resource fixups") from the pci tree.
The latter appears to supersede the former, so I used that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |