Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Showing
- drivers/bluetooth/Kconfig 12 additions, 1 deletiondrivers/bluetooth/Kconfig
- drivers/bluetooth/Makefile 1 addition, 0 deletionsdrivers/bluetooth/Makefile
- drivers/bluetooth/ath3k.c 187 additions, 0 deletionsdrivers/bluetooth/ath3k.c
- drivers/bluetooth/bluecard_cs.c 3 additions, 1 deletiondrivers/bluetooth/bluecard_cs.c
- drivers/bluetooth/bt3c_cs.c 3 additions, 1 deletiondrivers/bluetooth/bt3c_cs.c
- drivers/bluetooth/btuart_cs.c 3 additions, 1 deletiondrivers/bluetooth/btuart_cs.c
- drivers/bluetooth/dtl1_cs.c 3 additions, 1 deletiondrivers/bluetooth/dtl1_cs.c
- drivers/connector/connector.c 0 additions, 175 deletionsdrivers/connector/connector.c
- drivers/net/benet/be_main.c 2 additions, 2 deletionsdrivers/net/benet/be_main.c
- drivers/net/ixgbe/ixgbe_main.c 5 additions, 2 deletionsdrivers/net/ixgbe/ixgbe_main.c
- drivers/net/netxen/netxen_nic_main.c 3 additions, 1 deletiondrivers/net/netxen/netxen_nic_main.c
- drivers/net/sky2.c 3 additions, 5 deletionsdrivers/net/sky2.c
- drivers/net/usb/cdc_ether.c 1 addition, 1 deletiondrivers/net/usb/cdc_ether.c
- include/linux/connector.h 0 additions, 32 deletionsinclude/linux/connector.h
- net/bluetooth/hidp/core.c 36 additions, 34 deletionsnet/bluetooth/hidp/core.c
- net/bluetooth/l2cap.c 6 additions, 8 deletionsnet/bluetooth/l2cap.c
- net/dccp/ccid.c 1 addition, 1 deletionnet/dccp/ccid.c
- net/dccp/ccid.h 5 additions, 3 deletionsnet/dccp/ccid.h
- net/dccp/probe.c 2 additions, 2 deletionsnet/dccp/probe.c
- net/key/af_key.c 8 additions, 7 deletionsnet/key/af_key.c
Loading
Please register or sign in to comment