Hi David, John,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/ath5k/base.c between commit
4f148798de04f7d13d2021f06eee6bccd6453651 ("ath5k: warn and correct rate
for unknown hw rate indexes") from the wireless-current tree and commit
db5b4f7ae3901fdc48c5b988fc2a5e0cb4ec1870 ("ath5k: fix hw rate index
condition") from the net tree.
It looks like the former is a superset of the latter. I fixed it up (I
used the wireless-current version) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpWbQvs9h3dZ.pgp
Description: PGP signature
