David S. Miller a2bfbc072e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/can/Kconfig		2009-11-17 00:05:02 -08: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
Kconfig	can: Fix driver Kconfig structure	2009-11-13 19:56:55 -08:00
Makefile	can: Fix driver Kconfig structure	2009-11-13 19:56:55 -08:00