Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Sun, 17 Jul 2016 04:18:15 +0000 (12:18 +0800)
committerAlex Shi <alex.shi@linaro.org>
Sun, 17 Jul 2016 04:18:15 +0000 (12:18 +0800)
commitaa6b4960f4571ecc422a13b2490e91f5debb64a1
tree6af6af9e4c02335f7aba6cbedf2fb386ecf0a359
parent841eac1df7144c7ecd70ad8ea5942f12a260e845
parentbd06e78ba67a5ba3c2f8dbf8d0b4a68ddb0fdc05
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
include/linux/sock_diag.h
kernel/events/core.c