Merge branch 'linus-hot-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Dec 2010 00:25:31 +0000 (16:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Dec 2010 00:25:31 +0000 (16:25 -0800)
commitbeac3a4e2bb99d5182cfa0e2225d50cb3d4f5699
tree7f5ee9be42840f7c5a6045a481187e59679e41f6
parent06f57135fa1df583d5020739251352188d061cb4
parentad5427e5d1fcb73a43130b7c2b709ad19bb1ee47
Merge branch 'linus-hot-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'linus-hot-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix on-line resizing regression