]> 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: dd2f553 6482132)
Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Jul 2006 18:27:06 +0000 (14:27 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Jul 2006 18:27:06 +0000 (14:27 -0400)

Trivial merge
CAN classifier for Linux Traffic Control