Merge remote-tracking branch 'net-next/master'

Conflicts:
	drivers/net/ethernet/freescale/fsl_pq_mdio.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc drivers/net/ethernet/Makefile
Simple merge

diff --cc drivers/net/ethernet/freescale/fec.c
index c136230d50bb125e6ca1f4de21ae72485e0dbec2,01ee9cc417b2ff96bc8fc83d02f5bc28c3e453a8..4ea2bdc852f806756698a04309b905a1b77cc8c3
--- 1/drivers/net/ethernet/freescale/fec.c
--- 2/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@@ -1032,10 -1040,14 +1041,14 @@@ static int fec_enet_mii_init(struct pla
         * mdio interface in board design, and need to be configured by
         * fec0 mii_bus.
         */
 -      if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id > 0) {
 +      if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && fep->dev_id > 0) {
                /* fec1 uses fec0 mii_bus */
-               fep->mii_bus = fec0_mii_bus;
-               return 0;
+               if (mii_cnt && fec0_mii_bus) {
+                       fep->mii_bus = fec0_mii_bus;
+                       mii_cnt++;
+                       return 0;
+               }
+               return -ENOENT;
        }
  
        fep->mii_timeout = 0;

diff --cc drivers/net/ethernet/micrel/ks8842.c
Simple merge

diff --cc drivers/net/ppp/pptp.c
Simple merge

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

diff --cc net/batman-adv/translation-table.c
Simple merge

diff --cc net/bluetooth/bnep/core.c
Simple merge

diff --cc net/bluetooth/cmtp/core.c
Simple merge

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

diff --cc net/mac80211/agg-tx.c
Simple merge

diff --cc net/sunrpc/svcsock.c
Simple merge