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
..
af_packet.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
Kconfig	packet: Kill CONFIG_PACKET_MMAP.	2010-02-05 16:29:48 -08:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00