David S. Miller 0a0e9ae1bd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/bnx2x/bnx2x.h		2011-03-03 21:27:42 -08:00
..
c_can	can: c_can: Added support for Bosch C_CAN controller	2011-02-13 22:51:44 -08:00
mscan	m68knommu: Remove dependencies on nonexistent M68KNOMMU	2011-02-08 15:07:44 +10:00
sja1000	drivers/net/*/: Use static const	2010-12-21 02:16:10 -08:00
softing	CAN: add controller hardware name for Softing cards	2011-02-28 12:08:48 -08:00
usb	can: Add driver for esd CAN-USB/2 device	2010-08-03 16:37:58 -07:00
at91_can.c	net: can: at91_can: world-writable sysfs files	2011-02-04 13:06:27 -08:00
bfin_can.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
dev.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
flexcan.c	can: flexcan: fix use after free of priv	2010-10-26 10:48:58 -07:00
janz-ican3.c	net: can: janz-ican3: world-writable sysfs termination file	2011-02-04 13:06:27 -08:00
Kconfig	can: c_can: Added support for Bosch C_CAN controller	2011-02-13 22:51:44 -08:00
Makefile	can: c_can: Added support for Bosch C_CAN controller	2011-02-13 22:51:44 -08:00
mcp251x.c	workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'	2011-02-16 17:48:59 +01:00
pch_can.c	pch_can: fix tseg1/tseg2 setting issue	2011-02-09 16:46:21 -08:00
slcan.c	can: slcan: Add missing linux/sched.h include.	2010-12-08 18:41:03 -08:00
ti_hecc.c	Fix some #includes in CAN drivers (rebased for net-next-2.6)	2010-04-13 03:32:42 -07:00
vcan.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00