Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Wed, 13 Nov 2013 12:06:53 +0000 (12:06 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 13 Nov 2013 12:06:53 +0000 (12:06 +0000)
1  2 
kernel/cgroup.c

diff --cc kernel/cgroup.c
Simple merge