Merge branch 'v4.4/topic/coresight' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Fri, 24 Mar 2017 03:27:10 +0000 (11:27 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 24 Mar 2017 03:27:10 +0000 (11:27 +0800)
1  2 
kernel/events/core.c

Simple merge