]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mvebu/soc-cpuidle' into for-next
authorJason Cooper <jason@lakedaemon.net>
Fri, 16 May 2014 18:00:28 +0000 (18:00 +0000)
committerJason Cooper <jason@lakedaemon.net>
Fri, 16 May 2014 18:00:28 +0000 (18:00 +0000)
1  2 
arch/arm/mach-mvebu/mvebu-soc-id.c
drivers/bus/mvebu-mbus.c

Simple merge
Simple merge