]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 02:42:30 +0000 (13:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 02:42:30 +0000 (13:42 +1100)
commit4b896063356a2f7968c48d49ce4a9bf2167a079c
tree5a1a86787e6917f6aae49ab5b71b81eac33bf0a1
parentda10893cc46be6534c2e4856be619811ca7bf7d7
parent300e5fd160114920079dd3ec132e5c01d00e4a1d
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
net/ieee802154/6lowpan.c
drivers/net/wireless/adm8211.c
drivers/net/wireless/brcm80211/brcmfmac/p2p.c
drivers/net/wireless/hostap/hostap_ioctl.c
drivers/net/wireless/ipw2x00/libipw_rx.c
drivers/net/wireless/iwlwifi/pcie/drv.c
drivers/net/wireless/wl3501_cs.c
net/ipv6/addrconf.c
net/mac80211/iface.c
net/mac80211/tx.c