]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 02:33:58 +0000 (13:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 02:33:58 +0000 (13:33 +1100)
commit8901680fbdb90c72948e8c01cb923f9537126482
tree66b10472bda1ea976cc385aea63022b6516c289e
parent2cc716bba79c1e7c67feae7f2eef86be0744ca80
parent76ed94be65c8bd80b565865c186dd9f24bb2f23b
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