]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 01:08:49 +0000 (11:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 01:08:49 +0000 (11:08 +1000)
commitb3bc857dc9244f08eab3f1781be60f0bdd037007
tree6b8d51eac3a49c72bbae5bea5149e7ecc8c64344
parentbc70b4097f8adbc8573709454e753b83d67c87be
parent7e79e622743e1104f4d7295f8e67ff2d78ba0e44
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-exynos4/pm.c
arch/arm/mach-imx/mm-imx25.c
arch/arm/mach-imx/mm-imx31.c
arch/arm/mach-imx/mm-imx35.c
arch/arm/mach-mx5/mm.c
arch/arm/mach-omap2/cm-regbits-44xx.h