]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 May 2011 21:13:25 +0000 (14:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 29 May 2011 21:13:25 +0000 (14:13 -0700)
commitb9f6847f86691eb04a330b229a2854204b95f071
tree332328b76dc4a3d51419c1d1cb23f50eb6c034c8
parent3b23d81abdd012a2f2a10138c1162e16de4f6fc5
parent01627ebcdf6dcb187d00cf1ed2c48d4bff140b02
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  eCryptfs: Remove ecryptfs_header_cache_2
  eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose()
  eCryptfs: Return useful code from contains_ecryptfs_marker
  eCryptfs: Fix new inode race condition
  eCryptfs: Cleanup inode initialization code
  eCryptfs: Consolidate inode functions into inode.c