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)
commit55fb78a3a80348d87b2e3d79f61f8a9252dd86f5
tree7f5ee9be42840f7c5a6045a481187e59679e41f6
parent08861c713c1314d5b7329a290b5d53ad711112c3
parent8a7411a24350bac141271755c66f40c56b0535ae
Merge branch 'linus-hot-fix' of git://git./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