Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/usb/cdc_ether.c
All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.
Signed-off-by: 
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- drivers/isdn/hardware/eicon/maintidi.c 3 additions, 2 deletionsdrivers/isdn/hardware/eicon/maintidi.c
- drivers/isdn/hardware/eicon/message.c 9 additions, 9 deletionsdrivers/isdn/hardware/eicon/message.c
- drivers/isdn/hisax/amd7930_fn.c 1 addition, 0 deletionsdrivers/isdn/hisax/amd7930_fn.c
- drivers/isdn/hisax/diva.c 1 addition, 1 deletiondrivers/isdn/hisax/diva.c
- drivers/isdn/hisax/hfc_usb.c 2 additions, 2 deletionsdrivers/isdn/hisax/hfc_usb.c
- drivers/isdn/hisax/hscx_irq.c 1 addition, 1 deletiondrivers/isdn/hisax/hscx_irq.c
- drivers/isdn/hisax/icc.c 1 addition, 0 deletionsdrivers/isdn/hisax/icc.c
- drivers/isdn/mISDN/stack.c 1 addition, 1 deletiondrivers/isdn/mISDN/stack.c
- drivers/net/benet/be_cmds.h 1 addition, 1 deletiondrivers/net/benet/be_cmds.h
- drivers/net/davinci_emac.c 1 addition, 1 deletiondrivers/net/davinci_emac.c
- drivers/net/e100.c 19 additions, 7 deletionsdrivers/net/e100.c
- drivers/net/e1000e/defines.h 2 additions, 0 deletionsdrivers/net/e1000e/defines.h
- drivers/net/e1000e/e1000.h 14 additions, 0 deletionsdrivers/net/e1000e/e1000.h
- drivers/net/e1000e/hw.h 1 addition, 0 deletionsdrivers/net/e1000e/hw.h
- drivers/net/e1000e/ich8lan.c 387 additions, 95 deletionsdrivers/net/e1000e/ich8lan.c
- drivers/net/e1000e/phy.c 4 additions, 11 deletionsdrivers/net/e1000e/phy.c
- drivers/net/pcmcia/pcnet_cs.c 1 addition, 1 deletiondrivers/net/pcmcia/pcnet_cs.c
- drivers/net/r8169.c 1 addition, 1 deletiondrivers/net/r8169.c
- drivers/net/sky2.c 2 additions, 0 deletionsdrivers/net/sky2.c
Loading
Please register or sign in to comment