David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-12-23 17:13:56 -05:00

..

auth.h

…

checksum.h

…

command.h

sctp: deal with multiple COOKIE_ECHO chunks

2011-09-16 17:17:22 -04:00

constants.h

…

sctp.h

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00

sm.h

…

structs.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-23 17:13:56 -05:00

tsnmap.h

…

ulpevent.h

…

ulpqueue.h

…

user.h

…