From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 May 2011 21:21:08 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: firefly_0821_release~7613^2~1500
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8a3d8ed027b563d2875cd3df816fb4a888a8551e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  flex_arrays: allow zero length flex arrays
  flex_array: flex_array_prealloc takes a number of elements, not an end
  SELinux: pass last path component in may_create
---

8a3d8ed027b563d2875cd3df816fb4a888a8551e