]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
projects / lisovros / linux_canprio.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3f749c 913e4a7)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 6 Feb 2006 23:46:39 +0000 (15:46 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 6 Feb 2006 23:46:39 +0000 (15:46 -0800)

Trivial merge
CAN classifier for Linux Traffic Control