summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2011-05-29 23:13:25 +0200
committerLinus Torvalds2011-05-29 23:13:25 +0200
commitbd1bfe40ac6bdf9593da29b822bc301b77a97d6a (patch)
tree332328b76dc4a3d51419c1d1cb23f50eb6c034c8 /Makefile
parentMerge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osd (diff)
parenteCryptfs: Remove ecryptfs_header_cache_2 (diff)
downloadkernel-qcow2-linux-bd1bfe40ac6bdf9593da29b822bc301b77a97d6a.tar.gz
kernel-qcow2-linux-bd1bfe40ac6bdf9593da29b822bc301b77a97d6a.tar.xz
kernel-qcow2-linux-bd1bfe40ac6bdf9593da29b822bc301b77a97d6a.zip
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions