android_kernel_motorola_sm6225/drivers/net/can
David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c
2010-04-11 14:53:53 -07:00
..
mscan can: mscan-mpc5xxx: fix broken support for the MPC5200 2010-01-15 01:43:30 -08:00
sja1000 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -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 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 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
ti_hecc.c can: ti hecc module : add platform specific initialization callback. 2010-02-26 05:22:03 -08: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