Merge branch 'master' of git://gitorious.org/linux-can/linux-can

Browse source

...

This commit is contained in:

David S. Miller 2012-06-04 11:51:37 -04:00

parent bec4596b4e dc605dbdb8

commit 3ab2cdd028

3 changed files with 11 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

drivers/net/can/c_can/c_can.c

View file

1

drivers/net/can/c_can/c_can.h

View file

2

drivers/net/can/cc770/cc770_platform.c

View file