]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 04:04:58 +0000 (15:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 04:04:58 +0000 (15:04 +1100)
commit9f93bbcacb4f5c56870e8980d25cfbc4bd802505
tree1cccf9c7364dbaba1aed2d6cd17bd07c9f5cb5e3
parentc5646c325fcbbde42c19bb9277e670f708af2f18
parentd6222fb0d669307a49e2a96aad86c156a9bb9551
Merge remote-tracking branch 'wireless/master'

Conflicts:
Documentation/feature-removal-schedule.txt
Documentation/feature-removal-schedule.txt
drivers/net/wireless/libertas/main.c
drivers/net/wireless/mwifiex/main.c
include/linux/if_ether.h
net/mac80211/agg-rx.c
net/mac80211/cfg.c
net/mac80211/ibss.c
net/mac80211/iface.c
net/mac80211/sta_info.c