From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 8 Mar 2010 20:21:04 +0000 (+0000)
Subject: Merge branch 'origin' into devel-stable
X-Git-Tag: v2.6.34-rc2~66^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=988addf82e4c03739375279de73929580a2d4a6a;p=pandora-kernel.git

Merge branch 'origin' into devel-stable

Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c
---

988addf82e4c03739375279de73929580a2d4a6a
Reading git-diff-tree failed