| commit | 8a3d8ed027b563d2875cd3df816fb4a888a8551e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 04 14:21:08 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 04 14:21:08 2011 -0700 |
| tree | 61b5174933a53e7ec6246369c558fcb60e7967d8 | |
| parent | 30106b8ce2cc2243514116d6f29086e6deecc754 [diff] | |
| parent | 6f239284542bae297d27355d06afbb8df23c5db9 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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