linux-next: manual merge of the irda tree with the net tree

[Stephen Rothwell]

Hi Samuel,

Today's linux-next merge of the irda tree got a conflict in
drivers/net/irda/irda-usb.c between commit
8e95a2026f3b43f7c3d676adaccd2de9532e8dcc ("drivers/net: Move && and || to
end of previous line") from the net tree and commit
1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 ("irda: test index before read
in stir421x_patch_device()") from the irda tree.

I fixed it up (using the irda tree version) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature