]> 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: ee932bf af14cca)
Merge branch 'nf' of git://1984.lsi.us.es/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 23 Feb 2012 05:20:14 +0000 (00:20 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 23 Feb 2012 05:20:14 +0000 (00:20 -0500)

Trivial merge
CAN classifier for Linux Traffic Control