]> 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>
Wed, 3 Aug 2011 01:19:01 +0000 (11:19 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Aug 2011 01:19:01 +0000 (11:19 +1000)
commit22b0691087119a692678b2c9847fb2cf72dab072
treeb9ad4a555994f80c4778c5527aa3856c4079b458
parent7bf0012b33d41cf8e541a4de3548000d168e2701
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