Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Sat, 13 Dec 2014 11:40:22 +0000 (11:40 +0000)
committerMark Brown <broonie@kernel.org>
Sat, 13 Dec 2014 11:40:22 +0000 (11:40 +0000)
1  2 
kernel/power/Kconfig

Simple merge