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
..
8139cp.c	net: introduce and use netdev_features_t for device features sets	2011-11-16 17:43:10 -05:00
8139too.c	sweep the floors and convert some .get_drvinfo routines to strlcpy	2011-11-08 15:11:57 -05:00
atp.c
atp.h
Kconfig	net/ethernet: sc92031 is not Realtek	2011-11-01 19:30:38 -04:00
Makefile	net/ethernet: sc92031 is not Realtek	2011-11-01 19:30:38 -04:00
r8169.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00