Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Fri, 25 Nov 2016 04:50:56 +0000 (12:50 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 25 Nov 2016 04:50:56 +0000 (12:50 +0800)
commit5497d2d7d543b4b8854700d47a175e157fecbfd1
treeb8453c3e27a46e4322cc7749d4b0a209e8476a92
parent063181a4658b16e6bc0efe24671d5db3097342a4
parent4eb9a81002485a7abfa53a334dde5bc10328079f
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4

Conflicts:
keep check_object_size in copy_from_user
in arch/sparc/include/asm/uaccess_64.h
arch/sparc/include/asm/uaccess_64.h