]> 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, 29 Jul 2011 01:57:27 +0000 (11:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 01:57:27 +0000 (11:57 +1000)
commita84be4dc0b6bff1bc443ca11a94b4d0f0c4d8c1c
treee76ba25a557c3a9dd94f052d96565b52c091487b
parent8b0347256ca02868a50298c49dc3fb62fdc5cfb6
parent7e79e622743e1104f4d7295f8e67ff2d78ba0e44
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-exynos4/pm.c
arch/arm/mach-omap2/cm-regbits-44xx.h