Merge branch 'mvebu/fixes' into mvebu/soc-cpuidle
authorJason Cooper <jason@lakedaemon.net>
Thu, 24 Jul 2014 11:41:36 +0000 (11:41 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 24 Jul 2014 11:41:36 +0000 (11:41 +0000)
commit5abe65e3d67aac9f9b5c08660f817a2d6ec5515f
tree7422d99151ab4967a4b0f1783a156e6a1527ccde
parentba364fc752daeded072a5ef31e43b84cb1f9e5fd
parenta728b977429383b3fe92b6e3bff9e69365609e0f
Merge branch 'mvebu/fixes' into mvebu/soc-cpuidle
arch/arm/mach-mvebu/Kconfig
arch/arm/mach-mvebu/Makefile
arch/arm/mach-mvebu/board-v7.c
arch/arm/mach-mvebu/pmsu.c