Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Dec 2010 20:41:17 +0000 (12:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Dec 2010 20:41:17 +0000 (12:41 -0800)
commita4851d8f7d6351a395d36ae8fdcf41745a832d76
treee1d62324316e36eea0146cb9714378edc77f458d
parent667c78afaec0ac500908e191e8f236e9578d7b1f
parent6d5c3aa84b3e431f2d0fc39c73c867d1a4dd8cff
Merge branch 'for_linus' of git://git./linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix typo which broke '..' detection in ext4_find_entry()
  ext4: Turn off multiple page-io submission by default