projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cd1acdf 3063287)
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)
commitbd1bfe40ac6bdf9593da29b822bc301b77a97d6a
tree332328b76dc4a3d51419c1d1cb23f50eb6c034c8tree | snapshot
parentcd1acdf1723d71b28175f95b04305f1cc74ce363commit | diff
parent3063287053bca5207e121c567b95b2b6f0bdc2c8commit | diff
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: 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
John Crispins staging tree