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

Conflicts:
	drivers/net/ethernet/broadcom/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/Kconfig
index 52c96036dcc41ca5174f97b52c633126c8aea3cf,7b839bf5bb7a4d54349443bedc97def4d1dff7c0..2fa5b86f139db626f1839c7b3bc9087444179b28
--- 1/drivers/net/ethernet/broadcom/Kconfig
--- 2/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@@ -130,8 -130,7 +130,8 @@@ config BNX2X_SRIO
  
  config BGMAC
        tristate "BCMA bus GBit core support"
-       depends on BCMA_HOST_SOC && HAS_DMA
+       depends on BCMA_HOST_SOC && HAS_DMA && BCM47XX
 +      select PHYLIB
        ---help---
          This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus.
          They can be found on BCM47xx SoCs and provide gigabit ethernet.

diff --cc include/linux/ieee80211.h
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc include/net/mac80211.h
Simple merge