From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Apr 2009 15:39:02 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e25c2c873f59c57cf1c2b1979cc8fb01958305ef;p=people%2Fssmith%2Fnetchannel2-pvops.git

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: Do not try to validate extents on special files
  ext4: Ignore i_file_acl_high unless EXT4_FEATURE_INCOMPAT_64BIT is present
  ext4: Fix softlockup caused by illegal i_file_acl value in on-disk inode
---

e25c2c873f59c57cf1c2b1979cc8fb01958305ef