]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Merge branch 'canprio' of ssh://rtime.felk.cvut.cz/lisovros/linux_canprio into canprio
authorRostislav Lisovy <lisovy@gmail.com>
Wed, 12 Oct 2011 12:37:04 +0000 (14:37 +0200)
committerRostislav Lisovy <lisovy@gmail.com>
Wed, 12 Oct 2011 12:37:04 +0000 (14:37 +0200)

Trivial merge