Merge master into can-usb1 branch to include proc update for 3.12+ kernels.
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Wed, 14 May 2014 13:26:39 +0000 (15:26 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Wed, 14 May 2014 13:26:39 +0000 (15:26 +0200)
commitb29ebe97fb5acced24e8ce9bb30e5d4dcad58815
treeffbf1bf7bad220417d5062d33c2ce7ecbbd91c7e
parent074e90ee2a9a0a573bc987097650e9c1ec233337
parentd33757f945ce0ca4556780f3634d7a35b8d8d58d
Merge master into can-usb1 branch to include proc update for 3.12+ kernels.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
lincan/src/Makefile.omk
lincan/src/proc.c