tree fb9740372e2a6ebbd815cb8e40f7c5849371b941
parent 01974ea61fc22f086d2987b4b717cbda055f0d03
parent 1296cc85c26e94eb865d03f82140f27d598de467
author Linus Torvalds <torvalds@linux-foundation.org> 1264475106 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1264475106 -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: Drop EXT4_GET_BLOCKS_UPDATE_RESERVE_SPACE flag
  ext4: Fix quota accounting error with fallocate
  ext4: Handle -EDQUOT error on write