Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Fri, 8 Aug 2014 05:38:04 +0000 (13:38 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 8 Aug 2014 05:38:04 +0000 (13:38 +0800)
commitc482787d2329a563f1aee8af59190d5578935855
treedd54cf862ceb61449ef4754c50b93baf4478b25c
parent419d774626e602be462028744381a47fca7edc57
parenta4b52d8f380b832c129e44641af7c34c945e6c7a
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
kernel/sched/core.c
mm/page_alloc.c