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
..
2011-10-19 03:10:46 -04:00
2010-07-12 12:57:55 -07:00
2010-11-28 18:24:14 -08:00
2011-12-16 15:49:51 -05:00
2011-12-16 15:49:51 -05:00