Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
Merge commit. Changes below are compared with the first parent: a0486407.
Changes
32 files changed · +206 −158
Only the first 600 diff lines are shown. Download the complete patch.
MAINTAINERS
View filedrivers/bluetooth/hci_ldisc.c
View filedrivers/net/wan/c101.c
View filedrivers/net/wan/hd6457x.c
View filedrivers/net/wan/hdlc_cisco.c
View filedrivers/net/wan/hdlc_fr.c
View filedrivers/net/wan/hdlc_generic.c
View filedrivers/net/wan/wanxl.c
View fileinclude/linux/hdlc.h
View filenet/ax25/af_ax25.c
View filenet/ax25/ax25_ds_subr.c
View filenet/ax25/ax25_ds_timer.c
View filenet/ax25/ax25_iface.c
View fileThis diff is incomplete. Download the complete patch.
net/bluetooth/cmtp/capi.c
View fileThis diff is incomplete. Download the complete patch.
net/bluetooth/cmtp/core.c
View fileThis diff is incomplete. Download the complete patch.
net/bluetooth/hci_core.c
View fileThis diff is incomplete. Download the complete patch.
net/bluetooth/hidp/Kconfig
View fileThis diff is incomplete. Download the complete patch.
net/bluetooth/hidp/core.c
View fileThis diff is incomplete. Download the complete patch.
net/bluetooth/l2cap.c
View fileThis diff is incomplete. Download the complete patch.
net/bluetooth/rfcomm/core.c
View fileThis diff is incomplete. Download the complete patch.
net/bluetooth/rfcomm/tty.c
View fileThis diff is incomplete. Download the complete patch.
net/bluetooth/sco.c
View fileThis diff is incomplete. Download the complete patch.
net/core/stream.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/fib_trie.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/ipcomp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/tcp_highspeed.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/addrconf.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/ipcomp6.c
View fileThis diff is incomplete. Download the complete patch.
net/netrom/af_netrom.c
View fileThis diff is incomplete. Download the complete patch.
net/netrom/nr_timer.c
View fileThis diff is incomplete. Download the complete patch.
net/rose/af_rose.c
View fileThis diff is incomplete. Download the complete patch.
net/sched/act_api.c
View fileThis diff is incomplete. Download the complete patch.