From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 6 Jan 2011 22:33:32 +0000 (+0000)
Subject: Merge branch 'devel-stable' into devel
X-Git-Tag: v2.6.38-rc1~471^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34;p=pandora-kernel.git

Merge branch 'devel-stable' into devel

Conflicts:
	arch/arm/mach-pxa/clock.c
	arch/arm/mach-pxa/clock.h
---

404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34
Reading git-diff-tree failed