From: Olof Johansson <olof@lixom.net>
Date: Mon, 1 Oct 2012 21:19:17 +0000 (-0700)
Subject: Merge branch 'next/soc' into HEAD
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~56^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d55d5968a8622f3ea20ec40737aea1cfba6438c;p=pandora-kernel.git

Merge branch 'next/soc' into HEAD

Conflicts:
	arch/arm/mach-ux500/clock.c
	arch/arm/mach-ux500/cpu.c
	drivers/clocksource/Makefile
---

6d55d5968a8622f3ea20ec40737aea1cfba6438c
Reading git-diff-tree failed