]> 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, 23 Oct 2012 00:36:21 +0000 (11:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Oct 2012 00:36:21 +0000 (11:36 +1100)
commit1dce3c01e9549bd74be6541623363a66ec13934e
treeb461c2de4c5ce08aa226f2e559dbbfef8a99d0e0
parent74321c63a3d7d6f8aad27125206937314b61cdce
parent9917c85b06c2eb9d61c0f2dadd2d5d8788f7e563
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
net/mac80211/mlme.c
drivers/bcma/main.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
include/net/cfg80211.h
net/bluetooth/smp.c
net/mac80211/iface.c
net/mac80211/mlme.c
net/mac80211/sta_info.c
net/mac80211/util.c
net/wireless/mlme.c