]> 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>
Mon, 12 Aug 2013 18:45:06 +0000 (14:45 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 12 Aug 2013 18:45:06 +0000 (14:45 -0400)
commite9eab40968157bdece5a9bbfbe8427de6fa9fb20
tree77faf3fc889fb0e77ce7c4778f2bbc93fdf8cdd2
parent9e07c927e3a4ba21af43536594753738e1b77b6a
parentf4487bf8c9cf7d555b1a321ff0f62b897939da83
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/ethernet/broadcom/Kconfig
MAINTAINERS
drivers/net/ethernet/broadcom/Kconfig
include/linux/ieee80211.h
include/net/cfg80211.h
include/net/mac80211.h