]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 05:16:11 +0000 (15:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 05:16:11 +0000 (15:16 +1000)
commit8ff466db3599a2e38e1282c1ccf607ea5f9615a5
tree3ce788ca6f5e11d6b3ae1bc3c0345dc1f4fcd9ca
parent59b5153f96837f71d1649c92b104668fb43d92be
parented46fdfc54d2d4523fdd727708fe0b9e2be993cc
Merge remote-tracking branch 'wireless/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
MAINTAINERS
net/mac80211/ibss.c
net/mac80211/iface.c
net/wireless/nl80211.c