]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 01:58:39 +0000 (12:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 01:58:39 +0000 (12:58 +1100)
commit9229d517fa51f17f20749969d01983a1189c08ac
tree1c394bec3b4cd9a9e5c0b61477b5b7734339f24b
parent0a69df30ffab31c5d8796b78f8b869dd12abbe06
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