]> 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>
Thu, 13 Mar 2014 18:21:43 +0000 (14:21 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Mar 2014 18:21:43 +0000 (14:21 -0400)
commitaf07b7c6bf902afb979f8a03090e261fce3ca243
treee344340c7f0aed4c8faf7534fabbc64607a8e784
parent31949acde22f26bbe1d46f1eb5cbc5ed572ee858
parent5af7d00095bf42e83e7f21958d1fe0d64319932e
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/mwifiex/main.c
net/mac80211/iface.c
net/wireless/chan.c
net/wireless/util.c