Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/freescale/Kconfig
index 820de8b,9de3764..3574e14
--- 1/drivers/net/ethernet/freescale/Kconfig
--- 2/drivers/net/ethernet/freescale/Kconfig
+++ b/drivers/net/ethernet/freescale/Kconfig
@@@ -21,10 -21,10 +21,10 @@@ config NET_VENDOR_FREESCAL
  if NET_VENDOR_FREESCALE
  
  config FEC
 -      bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
 +      tristate "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
        depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \
-                  ARCH_MXC || ARCH_MXS)
-       default ARCH_MXC || ARCH_MXS if ARM
+                  ARCH_MXC || SOC_IMX28)
+       default ARCH_MXC || SOC_IMX28 if ARM
        select PHYLIB
        ---help---
          Say Y here if you want to use the built-in 10/100 Fast ethernet

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/b43/pio.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/sta_ioctl.c
Simple merge

diff --cc net/bluetooth/hci_core.c
Simple merge

diff --cc net/sched/sch_qfq.c
Simple merge