commit 1d822d6094bbc1363907d9221acf5e78fb5c3ed9
author Linus Torvalds <torvalds@linux-foundation.org> Sat Jun 01 06:59:14 2013 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Jun 01 06:59:14 2013 +0900
tree 34ac892dc1fad4d6289818a04886bb7b2623b74a
parent 7cfb9532581ed3d0e542712be6f9ca5bc1c3b021
parent a1457c0ce976bad1356b9b0437f2a5c3ab8a9cfc

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull reiserfs fixes from Jan Kara:
 "Three reiserfs fixes.  They fix real problems spotted by users so I
  hope they are ok even at this stage."

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  reiserfs: fix deadlock with nfs racing on create/lookup
  reiserfs: fix problems with chowning setuid file w/ xattrs
  reiserfs: fix spurious multiple-fill in reiserfs_readdir_dentry