David S. Miller d0e1e88d6e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/can/usb/ems_usb.c		2009-11-08 23:00:54 -08:00
..
Makefile	ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface	2009-09-21 11:32:26 -07:00
ems_usb.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-08 23:00:54 -08:00