Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rt2860/common/cmm_data_pci.c
drivers/staging/rt2860/common/cmm_data_usb.c between commit e9c549998dc2
("Revert wrong fixes for common misspellings") from Linus' tree and
commit fefecc6989b4 ("staging: rt2860sta and rt2870sta: Remove drivers
replaced in net/wireless") from the staging tree.
The files modified by the former were removed by the latter, so I did
that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp5D5_kgN3HH.pgp
Description: PGP signature
