Merge branch 'lpc32xx/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
authorRoland Stigge <stigge@antcom.de>
Tue, 13 Mar 2012 20:15:40 +0000 (21:15 +0100)
committerRoland Stigge <stigge@antcom.de>
Tue, 13 Mar 2012 20:15:40 +0000 (21:15 +0100)
Conflicts:
arch/arm/mach-lpc32xx/clock.c


Trivial merge