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

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

mscan

can: mscan-mpc5xxx: fix broken support for the MPC5200

2010-01-15 01:43:30 -08:00

sja1000

can: sja1000: add read/write routines for 8, 16 and 32-bit register access

2010-03-21 20:33:37 -07:00

usb

ems_usb: cleanup: remove uneeded check

2010-03-07 15:25:50 -08:00

at91_can.c

can: Proper ctrlmode handling for CAN devices

2010-01-15 01:39:17 -08:00

bfin_can.c

can: bfin_can: switch to common Blackfin can header

2010-03-22 20:05:45 -07:00

dev.c

can: netlink support for bus-error reporting and counters

2010-02-26 01:48:49 -08: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

Add hotplug support to mcp251x driver

2010-03-30 23:51:09 -07:00

ti_hecc.c

can: ti hecc module : add platform specific initialization callback.

2010-02-26 05:22:03 -08:00

vcan.c

can: Unify droping of invalid tx skbs and netdev stats

2010-01-12 02:00:46 -08:00