tree b675fbb92366514e53c240dfa0115cd4aeef00ba
parent f7e603ad8f78cd3b59e33fa72707da0cbabdf699
parent ebd3610b110bbb18ea6f9f2aeed1e1068c537227
author Linus Torvalds <torvalds@linux-foundation.org> 1235518774 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235518774 -0800

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* '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