Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jan 2013 19:53:19 +0000 (11:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jan 2013 19:53:19 +0000 (11:53 -0800)
commit262060ea46902523a9d16400aa6f5b472e99cfa6
tree7f99e780c4c10357f3a9ed3457c81e9f3a29cf38
parentb75b25b00d877706c3543729f39fdab59f6ca559
parent8f706111a860c026bcb0abe0c5936f59c31e5c87
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

Pull fuse fixes from Miklos Szeredi:
 "This contain a bugfix for CUSE and miscellaneous small fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: remove unused variable in fuse_try_move_page()
  fuse: make fuse_file_fallocate() static
  fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig
  cuse: fix uninitialized variable warnings
  cuse: do not register multiple devices with identical names
  cuse: use mutex as registration lock instead of spinlocks