Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Fri, 10 Jan 2014 15:56:41 +0000 (23:56 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 10 Jan 2014 15:56:41 +0000 (23:56 +0800)
commit60d29b4f9bf5466c1d6eccac414765b7ac2e8eb4
tree51ea304cd736ff03faa6bc568644a9d15b628d4a
parent0a1e99e83990f72055eadd7ab5793b9f63e16834
parent450cdfa9c5713551ab1438ab210679868b52a994
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
include/linux/mm_types.h
include/linux/mm_types.h
kernel/fork.c
kernel/freezer.c
kernel/sched/core.c
mm/mprotect.c
security/selinux/hooks.c