Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/rt2x00/rt73usb.c between commit
98a2103b0e9725ce5b3dcecd8dfcae977e6938ed ("rt2x00 : more devices to
rt73usb.c") from the wireless-current tree and various commits from the
net tree.
I used the version of the file from the wireless tree merge-test branch
(thanks John).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpsrjutikJaX.pgp
Description: PGP signature
