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)
Conflicts:
net/ieee802154/6lowpan.c

1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge