Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Apr 2013 17:49:27 +0000 (10:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Apr 2013 17:49:27 +0000 (10:49 -0700)
Pull reiserfs fix from Jan Kara:
 "A fix for reiserfs xattr bug exposed by changes to lookup_one_len()"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  reiserfs: Fix warning and inode leak when deleting inode with xattrs


Trivial merge