]> 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: 4f63e3c b9ca67b)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2010 18:12:59 +0000 (11:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2010 18:12:59 +0000 (11:12 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix lock annotations
  fuse: flush background queue on connection close


Trivial merge
CAN classifier for Linux Traffic Control