]> 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>
Fri, 12 Aug 2011 01:03:39 +0000 (11:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Aug 2011 01:03:39 +0000 (11:03 +1000)
commitc8da67a7f3b7bfbee11085185669d83998d0beeb
tree36013807a7541e76e10e60733cc0c63750c23c1e
parent317c4d2ebc0f53f28292afc32d1af5b0586ec37a
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