Messages in this thread | | | Date | Mon, 19 Sep 2011 16:39:46 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the kernel-doc tree |
| |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in Documentation/PCI/pci.txt between commit b814f0357fbe ("Documentation/PCI/pci.txt: fix a reference doc name") from the kernel-doc tree and commit c460578a674f ("Documentation: fix broken references") from the trivial tree.
It looks like the former supercedes the latter, so I used that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |