]> 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: 76ed94b c510eae)
Merge branch 'master' of git://github.com/padovan/bluetooth-next
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Oct 2011 18:06:47 +0000 (14:06 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Oct 2011 18:06:47 +0000 (14:06 -0400)

Trivial merge
CAN classifier for Linux Traffic Control