diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:21:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-04 14:21:08 -0700 |
commit | 8a3d8ed027b563d2875cd3df816fb4a888a8551e (patch) | |
tree | 61b5174933a53e7ec6246369c558fcb60e7967d8 /drivers/firewire | |
parent | slub: Fix the lockless code on 32-bit platforms with no 64-bit cmpxchg (diff) | |
parent | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus (diff) | |
download | linux-dev-8a3d8ed027b563d2875cd3df816fb4a888a8551e.tar.xz linux-dev-8a3d8ed027b563d2875cd3df816fb4a888a8551e.zip |
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
Diffstat (limited to 'drivers/firewire')
0 files changed, 0 insertions, 0 deletions