diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-11-18 08:53:53 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-11-18 08:53:53 -0800 |
commit | c4ceab9b6388e9e7079e5d903f96c6bcdacd3dda (patch) | |
tree | e86ff25495afb43ac5773143e50b6e2b97466f19 /linaro | |
parent | 444e6cd9569605e88e4b2317cbeb23849e449093 (diff) | |
parent | c037c42d164e186809b43838b8772aa1fe7cc8d5 (diff) |
Merge branch 'android-3.14' of ../../android/aosp into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.11-android
* 'android-3.14' of ../../android/aosp:
ANDROID: exec_domains: Disable request_module() call for personalities
UPSTREAM: pagemap: do not leak physical addresses to non-privileged userspace
Diffstat (limited to 'linaro')
0 files changed, 0 insertions, 0 deletions