sound/: merge LGE changes

Conflicts:
	sound/soc/codecs/max98088.c
	sound/soc/codecs/max98088.h
	sound/soc/codecs/spdif_transciever.c
	sound/soc/codecs/tlv320aic326x.c
	sound/soc/soc-core.c
	sound/soc/soc-jack.c
	sound/soc/tegra/tegra30_ahub.c
	sound/soc/tegra/tegra30_ahub.h
	sound/soc/tegra/tegra30_i2s.c
	sound/soc/tegra/tegra30_i2s.h
	sound/soc/tegra/tegra_aic326x.c
	sound/soc/tegra/tegra_max98088.c
	sound/soc/tegra/tegra_pcm.c
net/: merge LGE changes
kernel/: merge LGE changes

Conflicts:
	kernel/power/earlysuspend.c
	kernel/power/main.c
	kernel/power/wakelock.c
	kernel/rcutree.c
	kernel/sched.c
include/: merge LGE changes

Conflicts:
	include/linux/errqueue.h
	include/linux/ieee80211.h
	include/linux/if_arp.h
	include/linux/if_ether.h
	include/linux/if_mhi.h
	include/linux/l2mux.h
	include/linux/mfd/max77663-core.h
	include/linux/mhi.h
	include/linux/mpu.h
	include/linux/nct1008.h
	include/linux/nl80211.h
	include/linux/phonet.h
	include/linux/pkt_sched.h
	include/linux/skbuff.h
	include/linux/socket.h
	include/linux/spi/spi.h
	include/linux/tty.h
	include/media/mt9m114.h
	include/media/tegra_camera.h
	include/net/af_mhi.h
	include/net/cfg80211.h
	include/net/ieee80211_radiotap.h
	include/net/mac80211.h
	include/net/mhdp.h
	include/net/mhi/dgram.h
	include/net/mhi/mhdp.h
	include/net/mhi/raw.h
	include/net/mhi/sched.h
	include/net/mhi/sock.h
	include/net/phonet/phonet.h
	include/net/regulatory.h
	include/sound/soc-dapm.h
arch/: merge LGE changes [1/2]

Conflicts:
	arch/arm/boot/dts/tegra30-tai.dts
	arch/arm/configs/tegra3_android_defconfig
	arch/arm/kernel/traps.c
	arch/arm/tools/mach-types
arch/: merge LGE changes [2/2]

Conflicts:
	arch/arm/mach-tegra/Kconfig
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/Makefile.boot
	arch/arm/mach-tegra/baseband-xmm-power.c
	arch/arm/mach-tegra/baseband-xmm-power.h
	arch/arm/mach-tegra/board-cardhu.c
	arch/arm/mach-tegra/board-enterprise-panel.c
	arch/arm/mach-tegra/board-enterprise-sensors.c
	arch/arm/mach-tegra/board-enterprise.c
	arch/arm/mach-tegra/board-kai.c
	arch/arm/mach-tegra/common-t3.c
	arch/arm/mach-tegra/common.c
	arch/arm/mach-tegra/cpu-tegra.c
	arch/arm/mach-tegra/cpu-tegra3.c
	arch/arm/mach-tegra/devices.c
	arch/arm/mach-tegra/devices.h
	arch/arm/mach-tegra/dvfs.h
	arch/arm/mach-tegra/include/mach/clk.h
	arch/arm/mach-tegra/include/mach/gpio.h
	arch/arm/mach-tegra/include/mach/tegra-bb-power.h
	arch/arm/mach-tegra/include/mach/tegra_asoc_pdata.h
	arch/arm/mach-tegra/include/mach/thermal.h
	arch/arm/mach-tegra/include/mach/vmalloc.h
	arch/arm/mach-tegra/pinmux-t3-tables.c
	arch/arm/mach-tegra/pm-irq.c
	arch/arm/mach-tegra/pm-t3.c
	arch/arm/mach-tegra/tegra3_clocks.c
	arch/arm/mach-tegra/tegra3_dvfs.c
	arch/arm/mach-tegra/tegra3_emc.h
	arch/arm/mach-tegra/tegra3_thermal.c
	arch/arm/mach-tegra/tegra3_throttle.c
	arch/arm/mach-tegra/tegra_odm_fuses.c
	arch/arm/mach-tegra/usb_phy.c
	arch/arm/mach-tegra/wakeups-t3.c
drivers/: Merge LGE changes [1]

Conflicts:
	drivers/base/power/main.c
	drivers/cpufreq/cpufreq.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/cpufreq/cpufreq_userspace.c
	drivers/gpio/gpio-tegra.c
	drivers/i2c/busses/i2c-gpio.c
	drivers/input/Makefile
	drivers/input/evdev.c
	drivers/input/touchscreen/Makefile
drivers/: Merge LGE changes [2]

Conflicts:
	drivers/leds/Kconfig
	drivers/leds/Makefile
	drivers/media/video/Kconfig
	drivers/media/video/tegra/Kconfig
	drivers/media/video/tegra/Makefile
	drivers/media/video/tegra/mt9m114.c
	drivers/media/video/tegra/tegra_camera.c
	drivers/mfd/max77663-core.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/apds990x.c
	drivers/misc/inv_mpu/mpu3050/mlsl-kernel.c
	drivers/misc/max1749.c
	drivers/misc/mpu3050/mpu-dev.c
	drivers/misc/nct1008.c
	drivers/misc/tegra-baseband/Makefile
	drivers/misc/tegra-baseband/bb-m7400.c
	drivers/misc/tegra-baseband/bb-power.c
	drivers/misc/tegra-baseband/bb-power.h
	drivers/misc/therm_est.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sd.c
	drivers/mmc/host/sdhci-tegra.c
	drivers/mmc/host/sdhci.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/nfc/Makefile
	drivers/power/Makefile
	drivers/power/power_supply_sysfs.c
	drivers/regulator/Makefile
	drivers/regulator/max77663-regulator.c
	drivers/rtc/Kconfig
	drivers/spi/spi-tegra.c
	drivers/staging/android/logger.c
	drivers/staging/android/ram_console.c
	drivers/staging/hv/hv_kvp.c
	drivers/staging/iio/light/isl29028.c
	drivers/usb/class/cdc-acm.c
	drivers/usb/core/hub.c
	drivers/usb/gadget/android.c
	drivers/usb/gadget/f_adb.c
	drivers/usb/gadget/f_ecm.c
	drivers/usb/gadget/f_mtp.c
	drivers/usb/gadget/f_phonet.c
	drivers/usb/gadget/f_serial.c
	drivers/usb/misc/Kconfig
	drivers/video/backlight/Makefile
	drivers/video/tegra/Makefile
	drivers/video/tegra/dc/dc.c
	drivers/video/tegra/dc/hdmi.c
	drivers/video/tegra/dc/window.c
	drivers/video/tegra/fb.c
	drivers/video/tegra/host/bus_client.c
	drivers/video/tegra/host/nvhost_acm.c
	drivers/video/tegra/host/t30/t30.c
drivers/: Merge LGE changes [3]

Conflicts:
	drivers/usb/misc/boot_hsic_class.c
fix kconfig warnings
Fix compile errors

Conflicts:
	arch/arm/mach-tegra/baseband-xmm-power.c
	arch/arm/mach-tegra/cpu-tegra.c
	arch/arm/mach-tegra/tegra3_clocks.c
kernel/: fixes
drivers/: cleanup and fixes

Conflicts:
	drivers/misc/nct1008.c
	drivers/mmc/host/sdhci.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/regulator/max77663-regulator.c
	drivers/usb/core/hub.c
	drivers/usb/gadget/android.c
sound/: cleanup and fixes

Conflicts:
	sound/soc/tegra/tegra30_i2s.c
more fixes
more cleanup

Conflicts:
	arch/arm/mach-tegra/baseband-xmm-power.h
	include/linux/cpufreq.h
	include/linux/errqueue.h
	include/linux/i2c-algo-bit.h
	include/linux/if_arp.h
	include/linux/if_ether.h
	include/linux/mfd/max77663-core.h
	include/linux/nct1008.h
	include/linux/phonet.h
	include/linux/pkt_sched.h
	include/linux/platform_data/tegra_bpc_mgmt.h
	include/linux/platform_data/tegra_usb.h
	include/linux/socket.h
	include/linux/tty.h
	include/media/tegra_camera.h
	include/net/phonet/phonet.h
	include/sound/soc-dapm.h
	kernel/power/earlysuspend.c
migrate board configuration to 3.4
fix remaining warnings and compilation errors
fix linker errors, kernel compiles now
tspdrv: Add timed interface

For simpler compatibility with the standard Android vibration code