Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Nov 2011 16:59:12 +0000 (08:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Nov 2011 16:59:12 +0000 (08:59 -0800)
commit883381d9f1c5a6329bbb796e23ae52c939940310
treeb6b862d7391d537e309c6dd3798e56350c8b996d
parent0e500b6d23b5e99b6011047a53c4aeec78a41af8
parent4c81f045c0bd2cbb78cc6446a4cd98038fe11a2e
Merge branch 'dev' of git://git./linux/kernel/git/tytso/ext4

* 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix racy use-after-free in ext4_end_io_dio()