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)
commita7e4c6a7145ee375a688e1701ae4c975d6c6419a
tree0438b5b99a88ec694bb5a91c8ca0cb52fec928f1
parent73d43d00649985cf6509b4f99a720665f1b7c559
parent678a0222edc9da43a22145d68647500ee85e6c04
Merge branch 'lpc32xx/drivers' of git://git./linux/kernel/git/arm/arm-soc into lpc32xx/tmp

Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-lpc32xx/common.h
arch/arm/mach-lpc32xx/phy3250.c