Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Apr 2011 02:01:12 +0000 (19:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Apr 2011 02:01:12 +0000 (19:01 -0700)
commitcd2e49e90f1cae7726c9a2c54488d881d7f1cd1c
tree79c3c9d6e4258f38ff81dd141970885bbc65807a
parent71e9e6a5823a6b7976c3e47e2f6c7ba364526a93
parent5be79de2e1ffa19d871a494697cf76cddee93384
Merge branch 'for-linus' of git://git./linux/kernel/git/ecryptfs/ecryptfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  eCryptfs: Flush dirty pages in setattr
  eCryptfs: Handle failed metadata read in lookup
  eCryptfs: Add reference counting to lower files
  eCryptfs: dput dentries returned from dget_parent
  eCryptfs: Remove extra d_delete in ecryptfs_rmdir