]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 01:58:37 +0000 (11:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 01:58:37 +0000 (11:58 +1000)
commit716f4a42eaf4ae3b20571a10c91cb766914e6678
tree8e7a1af5a98cca1efed7e898199f59373b5c3ecc
parentcd4e8a061752d762f9d9e4f767cdd1dd4317112a
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