diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-10 22:05:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-10 22:05:54 -0700 |
| commit | 628a604842b68cb0fc483e7cd5fcfb836be633d5 (patch) | |
| tree | 686b7f3eb491a9626c72b449e34baa3df3c303a9 | |
| parent | 9de79c127cccecb11ae6a21ab1499e87aa222880 (diff) | |
| parent | 115978859272b958366d4a08c99a24f9625fa663 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize
| -rw-r--r-- | MAINTAINERS | 66 | ||||
| -rw-r--r-- | drivers/infiniband/hw/cxgb3/Makefile | 2 | ||||
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 1241 | ||||
| -rw-r--r-- | drivers/net/Makefile | 92 | ||||
| -rw-r--r-- | drivers/net/arm/Kconfig | 22 | ||||
| -rw-r--r-- | drivers/net/arm/Makefile | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c501.c (renamed from drivers/net/3c501.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c501.h (renamed from drivers/net/3c501.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c509.c (renamed from drivers/net/3c509.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c515.c (renamed from drivers/net/3c515.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c574_cs.c (renamed from drivers/net/pcmcia/3c574_cs.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c589_cs.c (renamed from drivers/net/pcmcia/3c589_cs.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/3c59x.c (renamed from drivers/net/3c59x.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/Kconfig | 147 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/Makefile | 12 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/acenic.c (renamed from drivers/net/acenic.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/acenic.h (renamed from drivers/net/acenic.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/typhoon.c (renamed from drivers/net/typhoon.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/3com/typhoon.h (renamed from drivers/net/typhoon.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/3c503.c (renamed from drivers/net/3c503.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/3c503.h (renamed from drivers/net/3c503.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/8390.c (renamed from drivers/net/8390.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/8390.h (renamed from drivers/net/8390.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/8390p.c (renamed from drivers/net/8390p.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/Kconfig | 335 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/Makefile | 29 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ac3200.c (renamed from drivers/net/ac3200.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/apne.c (renamed from drivers/net/apne.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ax88796.c (renamed from drivers/net/ax88796.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/axnet_cs.c (renamed from drivers/net/pcmcia/axnet_cs.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/e2100.c (renamed from drivers/net/e2100.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/es3210.c (renamed from drivers/net/es3210.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/etherh.c (renamed from drivers/net/arm/etherh.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/hp-plus.c (renamed from drivers/net/hp-plus.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/hp.c (renamed from drivers/net/hp.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/hydra.c (renamed from drivers/net/hydra.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/lib8390.c (renamed from drivers/net/lib8390.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/lne390.c (renamed from drivers/net/lne390.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/mac8390.c (renamed from drivers/net/mac8390.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne-h8300.c (renamed from drivers/net/ne-h8300.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne.c (renamed from drivers/net/ne.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne2.c (renamed from drivers/net/ne2.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne2k-pci.c (renamed from drivers/net/ne2k-pci.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/ne3210.c (renamed from drivers/net/ne3210.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/pcnet_cs.c (renamed from drivers/net/pcmcia/pcnet_cs.c) | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/smc-mca.c (renamed from drivers/net/smc-mca.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/smc-ultra.c (renamed from drivers/net/smc-ultra.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/smc-ultra32.c (renamed from drivers/net/smc-ultra32.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/stnic.c (renamed from drivers/net/stnic.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/wd.c (renamed from drivers/net/wd.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/zorro8390.c (renamed from drivers/net/zorro8390.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 24 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 13 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/7990.c (renamed from drivers/net/7990.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/7990.h (renamed from drivers/net/7990.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/Kconfig | 192 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/Makefile | 20 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/a2065.c (renamed from drivers/net/a2065.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/a2065.h (renamed from drivers/net/a2065.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/am79c961a.c (renamed from drivers/net/arm/am79c961a.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/am79c961a.h (renamed from drivers/net/arm/am79c961a.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/amd8111e.c (renamed from drivers/net/amd8111e.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/amd8111e.h (renamed from drivers/net/amd8111e.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/ariadne.c (renamed from drivers/net/ariadne.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/ariadne.h (renamed from drivers/net/ariadne.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/atarilance.c (renamed from drivers/net/atarilance.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/au1000_eth.c (renamed from drivers/net/au1000_eth.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/au1000_eth.h (renamed from drivers/net/au1000_eth.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/declance.c (renamed from drivers/net/declance.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/depca.c (renamed from drivers/net/depca.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/depca.h (renamed from drivers/net/depca.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/hplance.c (renamed from drivers/net/hplance.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/hplance.h (renamed from drivers/net/hplance.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/lance.c (renamed from drivers/net/lance.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/mvme147.c (renamed from drivers/net/mvme147.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/ni65.c (renamed from drivers/net/ni65.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/ni65.h (renamed from drivers/net/ni65.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/nmclan_cs.c (renamed from drivers/net/pcmcia/nmclan_cs.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/pcnet32.c (renamed from drivers/net/pcnet32.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/sun3lance.c (renamed from drivers/net/sun3lance.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/sunlance.c (renamed from drivers/net/sunlance.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/Kconfig | 119 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/Makefile | 11 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/b44.c (renamed from drivers/net/b44.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/b44.h (renamed from drivers/net/b44.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.c (renamed from drivers/net/bcm63xx_enet.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.h (renamed from drivers/net/bcm63xx_enet.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c (renamed from drivers/net/bnx2.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.h (renamed from drivers/net/bnx2.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2_fw.h (renamed from drivers/net/bnx2_fw.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/Makefile (renamed from drivers/net/bnx2x/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x.h (renamed from drivers/net/bnx2x/bnx2x.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c (renamed from drivers/net/bnx2x/bnx2x_cmn.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h (renamed from drivers/net/bnx2x/bnx2x_cmn.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c (renamed from drivers/net/bnx2x/bnx2x_dcb.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h (renamed from drivers/net/bnx2x/bnx2x_dcb.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h (renamed from drivers/net/bnx2x/bnx2x_dump.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c (renamed from drivers/net/bnx2x/bnx2x_ethtool.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h (renamed from drivers/net/bnx2x/bnx2x_fw_defs.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h (renamed from drivers/net/bnx2x/bnx2x_fw_file_hdr.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h (renamed from drivers/net/bnx2x/bnx2x_hsi.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h (renamed from drivers/net/bnx2x/bnx2x_init.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h (renamed from drivers/net/bnx2x/bnx2x_init_ops.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c (renamed from drivers/net/bnx2x/bnx2x_link.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h (renamed from drivers/net/bnx2x/bnx2x_link.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c (renamed from drivers/net/bnx2x/bnx2x_main.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h (renamed from drivers/net/bnx2x/bnx2x_reg.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c (renamed from drivers/net/bnx2x/bnx2x_sp.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h (renamed from drivers/net/bnx2x/bnx2x_sp.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c (renamed from drivers/net/bnx2x/bnx2x_stats.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h (renamed from drivers/net/bnx2x/bnx2x_stats.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic.c (renamed from drivers/net/cnic.c) | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic.h (renamed from drivers/net/cnic.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic_defs.h (renamed from drivers/net/cnic_defs.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic_if.h (renamed from drivers/net/cnic_if.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/sb1250-mac.c (renamed from drivers/net/sb1250-mac.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c (renamed from drivers/net/tg3.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.h (renamed from drivers/net/tg3.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/chelsio/Kconfig | 106 | ||||
| -rw-r--r-- | drivers/net/ethernet/chelsio/Makefile | 8 | ||||
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb/Makefile (renamed from drivers/net/chelsio/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb/common.h (renamed from drivers/net/chelsio/common.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb/cphy.h (renamed from drivers/net/chelsio/cphy.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h (renamed from drivers/net/chelsio/cpl5_cmd.h) | 0 | ||||
| -rw-r--r-- |