Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Jan 2014 15:59:40 +0000 (10:59 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Jan 2014 15:59:40 +0000 (10:59 -0500)
commit235f93922878234f3d99a4205ebe3634ee955919
tree1c61b53899e26839941e46d9f6e4bba28ddd23b5
parent11b57f90257c1d6a91cee720151b69e0c2020cf6
parent1e2f9295f4c657500111514f92a3d3894d0e05b4
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

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/ti/wl1251/main.c
drivers/net/wireless/wl3501_cs.c
net/ipv6/addrconf.c
net/mac80211/iface.c