]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita8af9213f0d1aed50e665ce8b3b853b53555a1a8
tree1c61b53899e26839941e46d9f6e4bba28ddd23b5
parent599c1018e86226ed3bd9014f8217c772e2d3b3ff
parent09130aea780c0b9dbee0206118a8da065ce73ed7
Merge branch 'master' of git://git.kernel.org/pub/scm/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