Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Thu, 21 Nov 2013 10:16:35 +0000 (10:16 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 21 Nov 2013 10:16:35 +0000 (10:16 +0000)
1  2 
kernel/trace/trace.c

Simple merge