]> 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>
Thu, 28 Jul 2011 01:02:00 +0000 (11:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jul 2011 01:02:00 +0000 (11:02 +1000)
commit98a217a9bc5157433cdd0c06ae3614865cc6d429
treeb98b5ca9eab6e8d289f998f864e99f4c952b6395
parent051e76fab93e73d33ba1b840ef3cc2021396ec9d
parent7e79e622743e1104f4d7295f8e67ff2d78ba0e44
Merge remote-tracking branch 'arm-soc/for-next'

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