David S. Miller 6dec4ac4ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv4/inet_diag.c		2011-11-26 14:47:03 -05:00
..
c_can	can: c_can: remove duplicated #include	2011-07-23 20:01:15 -07:00
mscan	net/can/mscan: Fix buggy listen only mode setting	2011-11-14 14:30:05 -05:00
sja1000	net, sja1000: Don't include version.h in peak_pci.c when not needed	2011-11-21 16:43:53 -05:00
softing	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-07-25 13:56:39 -07:00
usb
at91_can.c	can: remove references to berlios mailinglist	2011-10-17 19:22:46 -04:00
bfin_can.c
dev.c	net: remove NETIF_F_NO_CSUM feature bit	2011-11-16 17:43:12 -05:00
flexcan.c	flexcan: Prefer device tree clock frequency if available.	2011-08-17 20:36:38 -07:00
janz-ican3.c
Kconfig
Makefile
mcp251x.c
pch_can.c
slcan.c	net: remove NETIF_F_NO_CSUM feature bit	2011-11-16 17:43:12 -05:00
ti_hecc.c	can: ti_hecc: include linux/io.h	2011-09-16 19:21:27 -04:00
vcan.c	can: remove references to berlios mailinglist	2011-10-17 19:22:46 -04:00