]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Nov 2011 22:28:13 +0000 (14:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Nov 2011 22:28:13 +0000 (14:28 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: Extend array bounds for all filename chars
  eCryptfs: Flush file in vma close
  eCryptfs: Prevent file create race condition


Trivial merge