summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 19:17:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 19:17:04 -0700
commit1ae276a9113305fb74c54f8df72da3ba2d559e60 (patch)
tree1a71302c1f856a5b2c3e2d195b9c3719500dd251 /Makefile
parent3b38f56c9dc262c31391b5ae095178960108049b (diff)
parentcb69f36ba1f8d5e73c46538e84a88178fb17f23d (diff)
downloadop-kernel-dev-1ae276a9113305fb74c54f8df72da3ba2d559e60.zip
op-kernel-dev-1ae276a9113305fb74c54f8df72da3ba2d559e60.tar.gz
Merge tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
Pull eCryptfs fixes from Tyler Hicks: "Two small fixes to the code that initializes the per-file crypto contexts" * tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs: ecryptfs: avoid ctx initialization race ecryptfs: remove check for if an array is NULL
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud