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

..

af_can.c

net: pass kern to net_proto_family create function

2009-11-05 22:18:14 -08:00

af_can.h

[CAN]: Add PF_CAN core module

2008-01-28 14:54:10 -08:00

bcm.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]: Add virtual CAN netdevice driver

2008-01-28 14:54:12 -08:00

Makefile

[CAN]: Add broadcast manager (bcm) protocol

2008-01-28 14:54:11 -08:00

proc.c

can: switch to seq_file

2009-08-29 00:19:38 -07:00

raw.c

net: drop capability from protocol definitions

2009-11-05 21:40:17 -08:00