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)
commit89c2af3c14ddf8ae48637a7b454d66ac5e0ca728
tree77faf3fc889fb0e77ce7c4778f2bbc93fdf8cdd2
parentf3dfd20860db3d0c400dd83a378176a28d3662db
parentd1e2586f484dfc36eee2b2d3a6c6c77be67ca492
Merge branch 'master' of git://git./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