Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/rt2x00/Kconfig drivers/net/wireless/rt2x00/rt2x00usb.c net/sctp/protocol.c
No related branches found
No related tags found
Showing
- drivers/atm/he.c 9 additions, 2 deletionsdrivers/atm/he.c
- drivers/atm/he.h 4 additions, 9 deletionsdrivers/atm/he.h
- drivers/atm/iphase.c 13 additions, 14 deletionsdrivers/atm/iphase.c
- drivers/net/wireless/b43/b43.h 0 additions, 1 deletiondrivers/net/wireless/b43/b43.h
- drivers/net/wireless/b43/dma.c 32 additions, 33 deletionsdrivers/net/wireless/b43/dma.c
- drivers/net/wireless/b43/main.c 10 additions, 6 deletionsdrivers/net/wireless/b43/main.c
- drivers/net/wireless/rt2x00/Kconfig 10 additions, 9 deletionsdrivers/net/wireless/rt2x00/Kconfig
- drivers/net/wireless/rt2x00/rt2x00pci.c 1 addition, 2 deletionsdrivers/net/wireless/rt2x00/rt2x00pci.c
- drivers/net/wireless/rt2x00/rt2x00usb.c 4 additions, 1 deletiondrivers/net/wireless/rt2x00/rt2x00usb.c
- drivers/net/wireless/rt2x00/rt73usb.c 1 addition, 0 deletionsdrivers/net/wireless/rt2x00/rt73usb.c
- drivers/ssb/main.c 9 additions, 3 deletionsdrivers/ssb/main.c
- include/linux/if_tunnel.h 1 addition, 1 deletioninclude/linux/if_tunnel.h
- net/atm/br2684.c 45 additions, 33 deletionsnet/atm/br2684.c
- net/core/dev.c 26 additions, 8 deletionsnet/core/dev.c
- net/ipv4/inet_connection_sock.c 3 additions, 3 deletionsnet/ipv4/inet_connection_sock.c
- net/ipv4/raw.c 1 addition, 1 deletionnet/ipv4/raw.c
- net/ipv4/tcp_ipv4.c 0 additions, 4 deletionsnet/ipv4/tcp_ipv4.c
- net/ipv6/sit.c 24 additions, 20 deletionsnet/ipv6/sit.c
- net/mac80211/wext.c 2 additions, 1 deletionnet/mac80211/wext.c
- net/mac80211/wme.c 1 addition, 1 deletionnet/mac80211/wme.c
Loading
Please register or sign in to comment