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)
commitc46f0e86d78733c3861160bdf9f77b52a02a625d
treeeb11f0e5cabc849a1b05722f69221eac7f598b97
parentf3401c581ccf80d60107699c012da3f820f88b9e
parentd768ff6691aaa3f2009df4a701f2c42e964d901e
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
kernel/trace/trace.c