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)
commitf891dfcd5fd0a0848ca42311e78eca8bf1d3e45b
treea58be80eaa964310fef20fe87386ef7fe3381763
parent7d8d2b5924c41ee249ee2280d4240d7cbba3fda8
parent3e5fe00cd38e033796a0de2ea9928c0cb460e6b6
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
kernel/power/Kconfig