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

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

diff --cc arch/arm/mach-lpc32xx/clock.c
index 0e01bf44479c27a4f45ba037848354845e0aa8d3,473015ac07bd04f670cd69a92757505734653748..ab8c21647422a1b33dd45b087dc006efb7151bb6
--- 1/arch/arm/mach-lpc32xx/clock.c
--- 2/arch/arm/mach-lpc32xx/clock.c
+++ b/arch/arm/mach-lpc32xx/clock.c
@@@ -1055,10 -1110,11 +1090,11 @@@ static struct clk_lookup lookups[] = 
        _REGISTER_CLOCK("dev:ssp1", NULL, clk_ssp1)
        _REGISTER_CLOCK("lpc32xx_keys.0", NULL, clk_kscan)
        _REGISTER_CLOCK("lpc32xx-nand.0", "nand_ck", clk_nand)
 -      _REGISTER_CLOCK("tbd", "i2s0_ck", clk_i2s0)
 -      _REGISTER_CLOCK("tbd", "i2s1_ck", clk_i2s1)
 +      _REGISTER_CLOCK(NULL, "i2s0_ck", clk_i2s0)
 +      _REGISTER_CLOCK(NULL, "i2s1_ck", clk_i2s1)
+       _REGISTER_CLOCK("lpc32xx-adc", NULL, clk_adc)
        _REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc)
 -      _REGISTER_CLOCK("dev:mmc0", "MCLK", clk_mmc)
 +      _REGISTER_CLOCK("dev:mmc0", NULL, clk_mmc)
        _REGISTER_CLOCK("lpc-net.0", NULL, clk_net)
        _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd)
        _REGISTER_CLOCK("lpc32xx_udc", "ck_usbd", clk_usbd)

diff --cc arch/arm/mach-lpc32xx/common.h
Simple merge

diff --cc arch/arm/mach-lpc32xx/phy3250.c
Simple merge