]> 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: 9b682c7 69b172f)
Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Dec 2011 19:24:13 +0000 (14:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Dec 2011 19:24:13 +0000 (14:24 -0500)

Trivial merge
CAN classifier for Linux Traffic Control