]> rtime.felk.cvut.cz Git - lisovros/iproute2_canprio.git/commitdiff
projects / lisovros / iproute2_canprio.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08dc32e 1551198)
Merge branch 'choke' into net-next
authorStephen Hemminger <stephen.hemminger@vyatta.com>
Fri, 25 Feb 2011 20:35:01 +0000 (12:35 -0800)
committerStephen Hemminger <stephen.hemminger@vyatta.com>
Fri, 25 Feb 2011 20:35:01 +0000 (12:35 -0800)
Conflicts:
include/linux/pkt_sched.h


Trivial merge
User-space part of CAN Classifier