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	Fix common misspellings	2011-03-31 11:26:23 -03:00
at91_can.c	can: remove references to berlios mailinglist	2011-10-17 19:22:46 -04:00
bfin_can.c	can: bfin_can: auto-calculate accessor sizes	2011-06-27 20:42:24 -07:00
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	net: remove mm.h inclusion from netdevice.h	2011-06-21 19:17:20 -07:00
Kconfig	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-07-05 23:23:37 -07:00
Makefile	can: c_can: Added support for Bosch C_CAN controller	2011-02-13 22:51:44 -08:00
mcp251x.c	can: mcp251x: Allow pass IRQ flags through platform data.	2011-04-06 12:24:26 -07:00
pch_can.c	treewide: fix a few typos in comments	2011-05-10 10:16:21 +02:00
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