Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 1 Aug 2014 06:30:56 +0000 (07:30 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 1 Aug 2014 06:30:56 +0000 (07:30 +0100)
1  2 
kernel/trace/trace.c

Simple merge