Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
4b7679a561e552eeda1e3567119bef2bca99b66e ("mac80211: clean up rate
control API") from Linus' tree and commit
9ea9c3769253947978746fab5cab5df10bc1ee35 ("Driver core: Use
dev_get_drvdata() accessors") from the driver-core tree.
The latter just modifies code that the former removes (the show_rs_window
function).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpj1M44AQviY.pgp
Description: PGP signature
