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)
commitc5a25af3dcb5db2556791c1fedcf2ce4f482b944
treee678e8e30aa6b95a3b42301eef2b8a2c0dd10467
parent7c18f677c1a7a94efc845ecedde2f1d1463d4359
parent6b5d37325d73c7d132a46af426481cec957faa5e
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
kernel/trace/trace.c