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
..
core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
Kconfig
Makefile
sock.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2011-11-09 14:54:33 -05:00
tty.c	Bluetooth: replace list_for_each with list_for_each_entry whenever possible	2011-11-07 17:24:46 -02:00