tree e1d62324316e36eea0146cb9714378edc77f458d
parent 667c78afaec0ac500908e191e8f236e9578d7b1f
parent 6d5c3aa84b3e431f2d0fc39c73c867d1a4dd8cff
author Linus Torvalds <torvalds@linux-foundation.org> 1292445677 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292445677 -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 typo which broke '..' detection in ext4_find_entry()
  ext4: Turn off multiple page-io submission by default