David S. Miller e1703b36c3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/e100.c
	drivers/net/e1000e/netdev.c

2010-04-27 12:49:13 -07:00

..

mscan

Fix some #includes in CAN drivers (rebased for net-next-2.6)

2010-04-13 03:32:42 -07:00

sja1000

Fix some #includes in CAN drivers (rebased for net-next-2.6)

2010-04-13 03:32:42 -07:00

usb

can: Fix possible NULL pointer dereference in ems_usb.c

2010-04-21 16:14:51 -07:00

at91_can.c

drivers: net: last_rx elimination

2010-04-13 03:32:43 -07:00

bfin_can.c

Fix some #includes in CAN drivers (rebased for net-next-2.6)

2010-04-13 03:32:42 -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

Kconfig

can: CAN_MCP251X should depend on HAS_DMA

2009-12-13 19:56:36 -08:00

Makefile

can: add the driver for Analog Devices Blackfin on-chip CAN controllers

2009-12-11 15:07:58 -08:00

mcp251x.c

Fix some #includes in CAN drivers (rebased for net-next-2.6)

2010-04-13 03:32:42 -07: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