]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Sep 2012 01:29:17 +0000 (09:29 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Sep 2012 01:29:17 +0000 (09:29 +0800)
Pull FUSE fixes from Miklos Szeredi:
 "This contains bugfixes for FUSE and CUSE and a compile warning fix."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix retrieve length
  fuse: mark variables uninitialized
  cuse: kill connection on initialization error
  cuse: fix fuse_conn_kill()


Trivial merge