Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Feb 2009 23:39:34 +0000 (15:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Feb 2009 23:39:34 +0000 (15:39 -0800)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: Fix deadlock in ext4_write_begin() and ext4_da_write_begin()
  ext4: Add fallback for find_group_flex


Trivial merge