]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:56:17 +0000 (10:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:56:17 +0000 (10:56 +1100)
commita31aed0002725bfb8bc299c66b9572acfc0b55a9
treea6af1cd39ee6ac6f31ae6c6c7938caee9a75fb35
parent91063ef0aa85bb94f6a39be7f947c39ee1de8b1d
parentb4487c2d0edaf1332d7a9f11b5661044955ef5e2
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/libertas/cfg.c
include/net/bluetooth/bluetooth.h
34 files changed:
drivers/net/wireless/ath/ath.h
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/net/wireless/ath/ath9k/ar9003_phy.c
drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwifiex/scan.c
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
include/linux/skbuff.h
include/net/bluetooth/bluetooth.h
include/net/bluetooth/hci_core.h
include/net/sock.h
net/bluetooth/hci_sysfs.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
net/core/skbuff.c
net/core/sock.c
net/mac80211/agg-rx.c
net/mac80211/agg-tx.c
net/mac80211/ht.c
net/mac80211/key.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/scan.c
net/mac80211/status.c
net/mac80211/tx.c
net/mac80211/util.c
net/nfc/nci/core.c
net/wireless/wext-compat.c