linux-next: manual merge of the trivial tree with the virtio tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
Documentation/virtual/virtio-spec.txt between commit 29266e2e29f1
("Remove Documentation/virtual/virtio-spec.txt") from the virtio tree and
commit d097ddaf529f ("doc: virtual: Fix typos in virtio-spec.txt") from
the trivial tree.

The former removed the file, so I did that and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature