]> 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 23:34:57 +0000 (09:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 23:34:57 +0000 (09:34 +1000)
commitbb36d453dae2b9efd7d8ccc37b37a04e9c8ecb1a
tree7ddc6b927327d2178127f39baff57845e721bfd9
parent134122145570f8716d5ff785d2486c96724ad9c3
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