]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:59:17 +0000 (11:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:59:17 +0000 (11:59 +1000)
commit749993d2268ab0192c3402ea8a700700bc43f3e8
tree97f5528ac8052d16261e879a2b626aa1d889b4e2
parent0210b25b2ad207004edb13ec96e68aed7b6dd7c0
parent11069ef318f92fb5960ebd7f9c01e5bc0dcb63fc
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/mgmt.c
drivers/net/wireless/iwlwifi/iwl-agn.c
net/bluetooth/hci_core.c
net/bluetooth/mgmt.c
net/mac80211/mlme.c
net/wireless/util.c