diff options
author | 2009-05-22 18:40:59 +1000 | |
---|---|---|
committer | 2009-05-22 18:40:59 +1000 | |
commit | 2c9e703c618106f5383226fbb1f526cb11034f8a (patch) | |
tree | 87d7548001ea82f655fede0640466fc16aabcdf7 /include/linux/stacktrace.h | |
parent | smack: do not beyond ARRAY_SIZE of data (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-2.6 (diff) | |
download | wireguard-linux-2c9e703c618106f5383226fbb1f526cb11034f8a.tar.xz wireguard-linux-2c9e703c618106f5383226fbb1f526cb11034f8a.zip |
Merge branch 'master' into next
Conflicts:
fs/exec.c
Removed IMA changes (the IMA checks are now performed via may_open()).
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include/linux/stacktrace.h')
0 files changed, 0 insertions, 0 deletions