linux-next: manual merge of the trivial tree with the kernel-doctree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature