From: Roland Stigge <stigge@antcom.de>
Date: Tue, 13 Mar 2012 20:15:40 +0000 (+0100)
Subject: Merge branch 'lpc32xx/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.4-rc1~73^2~3^2^3~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7e4c6a7145ee375a688e1701ae4c975d6c6419a;p=pandora-kernel.git

Merge branch 'lpc32xx/drivers' of git://git./linux/kernel/git/arm/arm-soc into lpc32xx/tmp

Conflicts:
	arch/arm/mach-lpc32xx/clock.c
---

a7e4c6a7145ee375a688e1701ae4c975d6c6419a
Reading git-diff-tree failed