Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
commitcd0e4a9dd432b2f0209d84b5b2420695c1fd3eb7
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Apr 2013 17:49:27 +0000 (3 10:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Apr 2013 17:49:27 +0000 (3 10:49 -0700)
treee197878dc16752958d00cc56d7f1b52e4bd3e631
parent17eb3d8fbe4c573426fc99946040305e79c07803
parent35e5cbc0af240778e61113286c019837e06aeec6
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

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