Merge branch 'linux-tegra' into android-tegra

diff --cc arch/arm/mach-tegra/tegra_i2s_audio.c
index 7b1fccbf820c941776b5614f495ca1f207dff266,dc6e5597a4388bc67c14ed4455624d2afe6a5499..03ef3c3551b804880afcba72acf5dc4c576f9dba
--- 1/arch/arm/mach-tegra/tegra_i2s_audio.c
--- 2/arch/arm/mach-tegra/tegra_i2s_audio.c
+++ b/arch/arm/mach-tegra/tegra_i2s_audio.c
@@@ -41,10 -41,9 +41,10 @@@
  #include <linux/ktime.h>
  #include <linux/sysfs.h>
  #include <linux/pm_qos_params.h>
 +#include <linux/wakelock.h>
  #include <linux/delay.h>
  #include <linux/tegra_audio.h>
- 
+ #include <linux/pm.h>
  #include <mach/dma.h>
  #include <mach/iomap.h>
  #include <mach/i2s.h>