From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 27 Mar 2012 10:30:31 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-linus
X-Git-Tag: v3.4-rc1~36^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0df89868006517417251e02cc4ce5d4b0165885;p=pandora-kernel.git

Merge branch 'devel-stable' into for-linus

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/plat-versatile/Kconfig
Merge fixes:
	arch/arm/mach-integrator/Kconfig
	drivers/clocksource/Kconfig
---

b0df89868006517417251e02cc4ce5d4b0165885
Reading git-diff-tree failed