]> 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: ead03e3 551e4fb)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
authorSteve French <sfrench@us.ibm.com>
Wed, 6 Feb 2008 16:04:00 +0000 (16:04 +0000)
committerSteve French <sfrench@us.ibm.com>
Wed, 6 Feb 2008 16:04:00 +0000 (16:04 +0000)

Trivial merge
CAN classifier for Linux Traffic Control