Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize

Browse source

...

This commit is contained in:

David S. Miller 2011-08-10 22:05:54 -07:00

parent 9de79c127c 1159788592

commit 628a604842

677 changed files with 422555 additions and 422323 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

66

MAINTAINERS

View file

2

drivers/infiniband/hw/cxgb3/Makefile

View file

2

drivers/infiniband/hw/cxgb4/Makefile

View file

1241

drivers/net/Kconfig

View file

92

drivers/net/Makefile

View file

22

drivers/net/arm/Kconfig

View file

3

drivers/net/arm/Makefile

View file

0

drivers/net/3c501.c → drivers/net/ethernet/3com/3c501.c

View file

0

drivers/net/3c501.h → drivers/net/ethernet/3com/3c501.h

View file

0

drivers/net/3c509.c → drivers/net/ethernet/3com/3c509.c

View file

0

drivers/net/3c515.c → drivers/net/ethernet/3com/3c515.c

View file

0

drivers/net/pcmcia/3c574_cs.c → drivers/net/ethernet/3com/3c574_cs.c

View file

0

drivers/net/pcmcia/3c589_cs.c → drivers/net/ethernet/3com/3c589_cs.c

View file

0

drivers/net/3c59x.c → drivers/net/ethernet/3com/3c59x.c

View file

147

drivers/net/ethernet/3com/Kconfig

View file

12

drivers/net/ethernet/3com/Makefile

View file

0

drivers/net/acenic.c → drivers/net/ethernet/3com/acenic.c

View file

0

drivers/net/acenic.h → drivers/net/ethernet/3com/acenic.h

View file

0

drivers/net/typhoon.c → drivers/net/ethernet/3com/typhoon.c

View file

0

drivers/net/typhoon.h → drivers/net/ethernet/3com/typhoon.h

View file

0

drivers/net/3c503.c → drivers/net/ethernet/8390/3c503.c

View file

0

drivers/net/3c503.h → drivers/net/ethernet/8390/3c503.h

View file

0

drivers/net/8390.c → drivers/net/ethernet/8390/8390.c

View file

0

drivers/net/8390.h → drivers/net/ethernet/8390/8390.h

View file

0

drivers/net/8390p.c → drivers/net/ethernet/8390/8390p.c

View file

335

drivers/net/ethernet/8390/Kconfig

View file

29

drivers/net/ethernet/8390/Makefile

View file

0

drivers/net/ac3200.c → drivers/net/ethernet/8390/ac3200.c

View file

0

drivers/net/apne.c → drivers/net/ethernet/8390/apne.c

View file

0

drivers/net/ax88796.c → drivers/net/ethernet/8390/ax88796.c

View file

2

drivers/net/pcmcia/axnet_cs.c → drivers/net/ethernet/8390/axnet_cs.c

View file

0

drivers/net/e2100.c → drivers/net/ethernet/8390/e2100.c

View file

0

drivers/net/es3210.c → drivers/net/ethernet/8390/es3210.c

View file

2

drivers/net/arm/etherh.c → drivers/net/ethernet/8390/etherh.c

View file

0

drivers/net/hp-plus.c → drivers/net/ethernet/8390/hp-plus.c

View file

0

drivers/net/hp.c → drivers/net/ethernet/8390/hp.c

View file

0

drivers/net/hydra.c → drivers/net/ethernet/8390/hydra.c

View file

0

drivers/net/lib8390.c → drivers/net/ethernet/8390/lib8390.c

View file

0

drivers/net/lne390.c → drivers/net/ethernet/8390/lne390.c

View file

0

drivers/net/mac8390.c → drivers/net/ethernet/8390/mac8390.c

View file

0

drivers/net/ne-h8300.c → drivers/net/ethernet/8390/ne-h8300.c

View file

0

drivers/net/ne.c → drivers/net/ethernet/8390/ne.c

View file

0

drivers/net/ne2.c → drivers/net/ethernet/8390/ne2.c

View file

0

drivers/net/ne2k-pci.c → drivers/net/ethernet/8390/ne2k-pci.c

View file

0

drivers/net/ne3210.c → drivers/net/ethernet/8390/ne3210.c

View file

2

drivers/net/pcmcia/pcnet_cs.c → drivers/net/ethernet/8390/pcnet_cs.c

View file

0

drivers/net/smc-mca.c → drivers/net/ethernet/8390/smc-mca.c

View file

0

drivers/net/smc-ultra.c → drivers/net/ethernet/8390/smc-ultra.c

View file

0

drivers/net/smc-ultra32.c → drivers/net/ethernet/8390/smc-ultra32.c

View file

0

drivers/net/stnic.c → drivers/net/ethernet/8390/stnic.c

View file

0

drivers/net/wd.c → drivers/net/ethernet/8390/wd.c

View file

0

drivers/net/zorro8390.c → drivers/net/ethernet/8390/zorro8390.c

View file

24

drivers/net/ethernet/Kconfig

View file

13

drivers/net/ethernet/Makefile

View file

0

drivers/net/7990.c → drivers/net/ethernet/amd/7990.c

View file

0

drivers/net/7990.h → drivers/net/ethernet/amd/7990.h

View file

192

drivers/net/ethernet/amd/Kconfig

View file

20

drivers/net/ethernet/amd/Makefile

View file

0

drivers/net/a2065.c → drivers/net/ethernet/amd/a2065.c

View file

0

drivers/net/a2065.h → drivers/net/ethernet/amd/a2065.h

View file

0

drivers/net/arm/am79c961a.c → drivers/net/ethernet/amd/am79c961a.c

View file

0

drivers/net/arm/am79c961a.h → drivers/net/ethernet/amd/am79c961a.h

View file

0

drivers/net/amd8111e.c → drivers/net/ethernet/amd/amd8111e.c

View file

0

drivers/net/amd8111e.h → drivers/net/ethernet/amd/amd8111e.h

View file

0

drivers/net/ariadne.c → drivers/net/ethernet/amd/ariadne.c

View file

0

drivers/net/ariadne.h → drivers/net/ethernet/amd/ariadne.h

View file

0

drivers/net/atarilance.c → drivers/net/ethernet/amd/atarilance.c

View file

0

drivers/net/au1000_eth.c → drivers/net/ethernet/amd/au1000_eth.c

View file

0

drivers/net/au1000_eth.h → drivers/net/ethernet/amd/au1000_eth.h

View file

0

drivers/net/declance.c → drivers/net/ethernet/amd/declance.c

View file

0

drivers/net/depca.c → drivers/net/ethernet/amd/depca.c

View file

0

drivers/net/depca.h → drivers/net/ethernet/amd/depca.h

View file

0

drivers/net/hplance.c → drivers/net/ethernet/amd/hplance.c

View file

0

drivers/net/hplance.h → drivers/net/ethernet/amd/hplance.h

View file

0

drivers/net/lance.c → drivers/net/ethernet/amd/lance.c

View file

0

drivers/net/mvme147.c → drivers/net/ethernet/amd/mvme147.c

View file

0

drivers/net/ni65.c → drivers/net/ethernet/amd/ni65.c

View file

0

drivers/net/ni65.h → drivers/net/ethernet/amd/ni65.h

View file

0

drivers/net/pcmcia/nmclan_cs.c → drivers/net/ethernet/amd/nmclan_cs.c

View file

0

drivers/net/pcnet32.c → drivers/net/ethernet/amd/pcnet32.c

View file

0

drivers/net/sun3lance.c → drivers/net/ethernet/amd/sun3lance.c

View file

0

drivers/net/sunlance.c → drivers/net/ethernet/amd/sunlance.c

View file

119

drivers/net/ethernet/broadcom/Kconfig

View file

11

drivers/net/ethernet/broadcom/Makefile

View file

0

drivers/net/b44.c → drivers/net/ethernet/broadcom/b44.c

View file

0

drivers/net/b44.h → drivers/net/ethernet/broadcom/b44.h

View file

0

drivers/net/bcm63xx_enet.c → drivers/net/ethernet/broadcom/bcm63xx_enet.c

View file

0

drivers/net/bcm63xx_enet.h → drivers/net/ethernet/broadcom/bcm63xx_enet.h

View file

0

drivers/net/bnx2.c → drivers/net/ethernet/broadcom/bnx2.c

View file

0

drivers/net/bnx2.h → drivers/net/ethernet/broadcom/bnx2.h

View file

0

drivers/net/bnx2_fw.h → drivers/net/ethernet/broadcom/bnx2_fw.h

View file

0

drivers/net/bnx2x/Makefile → drivers/net/ethernet/broadcom/bnx2x/Makefile

View file

0

drivers/net/bnx2x/bnx2x.h → drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

View file

0

drivers/net/bnx2x/bnx2x_cmn.c → drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

View file

0

drivers/net/bnx2x/bnx2x_cmn.h → drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

View file

0

drivers/net/bnx2x/bnx2x_dcb.c → drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c

View file

0

drivers/net/bnx2x/bnx2x_dcb.h → drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h

View file

0

drivers/net/bnx2x/bnx2x_dump.h → drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h

View file

0

drivers/net/bnx2x/bnx2x_ethtool.c → drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

View file

0

drivers/net/bnx2x/bnx2x_fw_defs.h → drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h

View file

Some files were not shown because too many files have changed in this diff Show more