From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 26 Mar 2011 10:03:03 +0000 (+0000)
Subject: Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa... 
X-Git-Tag: v2.6.39-rc2~40^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e;p=pandora-kernel.git

Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

Conflicts:
	arch/arm/mach-pxa/tosa.c
---

938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e
Reading git-diff-tree failed