]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-mpidr/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 00:44:02 +0000 (10:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 00:44:02 +0000 (10:44 +1000)
commita0e4dd2ce6f7db4fe019f7380ba7a40c691b0222
tree5fe0e170ac96fdb3fcc66939a4c40018c0e03aed
parentbf978e71f2a35c5cf89f2c4c106f8e7617c7d6cc
parent3fed6a1e3bf0ea0bb76e3c37c103e09126125c77
Merge remote-tracking branch 'arm-mpidr/for-next'

Conflicts:
arch/arm/kernel/suspend.c
arch/arm/include/asm/smp_plat.h
arch/arm/kernel/setup.c
arch/arm/kernel/suspend.c