Merge branch 'master' into can-usb1
authorppisa <pisa@cmp.felk.cvut.cz>
Sat, 28 Feb 2009 13:23:18 +0000 (14:23 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sat, 28 Feb 2009 13:23:18 +0000 (14:23 +0100)
commit05dd2640c82d97d88f0bcab5344630f24212836b
treefcc38ca5be6524426494042c610cb9d70399360d
parentcfa9e7afb7fe4e51b86b22be595dfe4c0615fa54
parentf419961de4a8e818c602b0642492ce76dd5bf979
Merge branch 'master' into can-usb1
lincan/include/can_sysdep.h
lincan/include/main.h
lincan/include/proc.h
lincan/include/setup.h
lincan/src/finish.c
lincan/src/main.c
lincan/src/modparms.c
lincan/src/proc.c
lincan/src/setup.c