]> 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: b1de663 fc0a2d5)
Merge branch 'canprio' of ssh://rtime.felk.cvut.cz/lisovros/linux_canprio into canprio
authorRostislav Lisovy <lisovy@gmail.com>
Fri, 19 Aug 2011 14:12:24 +0000 (16:12 +0200)
committerRostislav Lisovy <lisovy@gmail.com>
Fri, 19 Aug 2011 14:12:24 +0000 (16:12 +0200)
1  2 
net/sched/cls_canprio.c patch | diff1 | diff2 | blob | history

diff --cc net/sched/cls_canprio.c
Simple merge
CAN classifier for Linux Traffic Control