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

Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-04-26 12:16:46 -07:00

..

af_can.c

can: convert protocol handling to RCU

2011-04-06 12:35:51 -07:00

af_can.h

can: Speed up CAN frame receiption by using ml_priv

2010-01-03 21:31:03 -08:00

bcm.c

can: Add missing socket check in can/bcm release.

2011-04-19 20:36:59 -07:00

Kconfig

[CAN]: Add virtual CAN netdevice driver

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

Makefile

Net: can: Makefile: Remove deprecated kbuild goal definitions

2010-11-22 08:16:09 -08:00

proc.c

can: Speed up CAN frame receiption by using ml_priv

2010-01-03 21:31:03 -08:00

raw.c

can: add missing socket check in can/raw release

2011-04-20 12:37:59 -07:00