]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'mvebu/soc-cpuidle' into mvebu/soc
authorJason Cooper <jason@lakedaemon.net>
Thu, 24 Jul 2014 23:10:02 +0000 (23:10 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 24 Jul 2014 23:10:02 +0000 (23:10 +0000)
commit27d992654ccdbb7d2c0e5a446866ebd5c3dc7bb2
tree924613494fac61514c0fc806920ed5032f2322a6
parent2a401bdebe09c39a3e245309937814a09498ef57
parent370cef73f6426deab92460f4619f8d1ddb3dbe8c
Merge branch 'mvebu/soc-cpuidle' into mvebu/soc

Conflicts:
arch/arm/mach-mvebu/pmsu.c
arch/arm/mach-mvebu/platsmp.c
arch/arm/mach-mvebu/pmsu.c