Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	net/ieee802154/6lowpan.c

diff --cc drivers/net/wireless/adm8211.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/p2p.c
Simple merge

diff --cc drivers/net/wireless/hostap/hostap_ioctl.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/libipw_rx.c
Simple merge

diff --cc drivers/net/wireless/ti/wl1251/main.c
Simple merge

diff --cc drivers/net/wireless/wl3501_cs.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge