Merge source.mvista.com:linux-omap

Conflicts:

	arch/arm/mach-omap1/board-nokia770.c
	drivers/i2c/chips/tlv320aic23.c
	sound/arm/omap-aic23.h

diff --cc arch/arm/mach-omap1/board-nokia770.c
index 8f7a40bbcf3e6efb5bda8b9d2afc1d8dfae3912a,02b980d77b12d2079e84d23a27eea010005707be..ffbeca7f4a76bbce260d546fd57ff09ecb0baef3
--- 1/arch/arm/mach-omap1/board-nokia770.c
--- 2/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@@ -184,7 -193,8 +193,8 @@@ static void codec_delayed_power_down(vo
  {
        down(&audio_pwr_sem);
        if (audio_pwr_state == -1)
 -              tlv320aic23_power_down();
 +              aic23_power_down();
+       clk_disable(dspxor_ck);
        up(&audio_pwr_sem);
  }
  

diff --cc drivers/i2c/chips/tlv320aic23.c
Simple merge