Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Jul 2013 03:11:42 +0000 (20:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Jul 2013 03:11:42 +0000 (20:11 -0700)
commit90db76e829479ef2ba1fed8f2552846015469831
tree89fbb4eea90d27df20eef490ac9736c08c089eb2
parentf6a0d9d585699d4ab634cfd26fa9ce9c7cb864a1
parentdda5690defe4af62ee120f055e98e40d97e4c760
Merge tag 'ext4_for_linus' of git://git./linux/kernel/git/tytso/ext4

Pull ext[34] tmpfile bugfix from Ted Ts'o:
 "Fix regression caused by commit af51a2ac36d1f which added ->tmpfile()
  support (along with a similar fix for ext3)"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext3: fix a BUG when opening a file with O_TMPFILE flag
  ext4: fix a BUG when opening a file with O_TMPFILE flag