diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-11-11 15:05:46 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-11-11 15:05:46 -0800 |
| commit | 444e6cd9569605e88e4b2317cbeb23849e449093 (patch) | |
| tree | 00f706ad2b7cc34a0d2da73be8234290c51ae227 /.mailmap | |
| parent | 83ec293e0817e2536097dd86f7aba9c1c39ef1d2 (diff) | |
| parent | 7acde36bcee74c4adf1fa338d02a879939d0033a (diff) | |
Merge branch 'android-3.14' of ../../android/aosp into linux-linaro-lsk-v3.14-android
* 'android-3.14' of ../../android/aosp:
wakeup: Add the guard condition for len in pm_get_active_wakeup_sources
mm: reorder can_do_mlock to fix audit denial
staging: ion: debugfs to shrink pool
selinux: Android kernel compatibility with M userspace
selinux: extended permissions for ioctls
security: add ioctl specific auditing to lsm_audit
selinux: remove unnecessary pointer reassignment
Revert "security: lsm_audit: add ioctl specific auditing"
Revert "SELinux: per-command whitelisting of ioctls"
Revert "SELinux: use deletion-safe iterator to free list"
Revert "SELinux: ss: Fix policy write for ioctl operations"
arm: mm: support ARCH_MMAP_RND_BITS.
mm: mmap: Add new /proc tunable for mmap_base ASLR.
uid_cputime: Check for the range while removing range of UIDs.
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions