tree b2d5027fc0ca5eabca5a47e1bbdcc90133f5cc1e
parent 184b812f7da6726d7ea4ca409c7a8762ff6c6df6
parent 436bd75e47cf804dfe89f805106bb53ff577e99a
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1180709358 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1180709358 -0700

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:
  Define/reserve new ext4 superblock fields
  When ext4_ext_insert_extent() fails to insert new blocks
  ext4: Extent overlap bugfix
  Remove unnecessary exported symbols.
  EXT4: Fix whitespace