]> 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: aef6c92 4ae1652)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Jan 2012 21:43:54 +0000 (16:43 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Jan 2012 21:43:54 +0000 (16:43 -0500)

Trivial merge
CAN classifier for Linux Traffic Control