Messages in this thread | | | Date | Tue, 17 Nov 2009 15:54:17 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the pci tree |
| |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in arch/x86/pci/amd_bus.c between commit 99935a7a59eaca0292c1a5880e10bae03f4a5e3d ("x86/PCI: read root resources from IOH on Intel") from the pci tree and commit 17530b1c635dfd1f258afc6b07b986b425d66ebd ("tree-wide: fix assorted typos all over the place") from the trivial tree.
The comment fixed up by the trivial tree patch has moved to arch/x86/pci/bus_numa.h and I haven't bothered to fix it there. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |