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

Conflicts:
	arch/arm/mach-lpc32xx/clock.c
This commit is contained in:
Roland Stigge 2012-03-13 21:15:40 +01:00
commit a7e4c6a714
4 changed files with 60 additions and 0 deletions