]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 02:01:42 +0000 (12:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 02:01:42 +0000 (12:01 +1000)
commit28de6ecf60e14da5035567a7efa6304903c0d253
tree8d6143adfdb568eb863b5df3b0e9c09bcddd1f7f
parent4733831c23300205c0b56b7e837efcb5fb2df5e0
parentda3ba88a9996cd64c6768bed5727e02da81e2c8d
Merge remote-tracking branch 'wireless/master'

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