linux-next: manual merge of the pci tree with the powerpc tree
From: Stephen Rothwell <hidden>
Date: 2012-03-09 01:32:27
Also in:
linux-next, lkml
Hi Jesse,
Today's linux-next merge of the pci tree got a conflict in
arch/powerpc/platforms/iseries/pci.c between commit 8ee3e0d69623
("powerpc: Remove the main legacy iSerie platform code") from the powerpc
tree and commit 673c97562489 ("powerpc/PCI: replace pci_probe_only with
pci_flags") from the pci tree.
The former removed the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au Attachments
- (unnamed) [application/pgp-signature] 836 bytes