Merge commit 'main-jb-2012.08.03-B4' into t114-0806
authorPradeep Kumar <pgoudagunta@nvidia.com>
Mon, 6 Aug 2012 17:31:18 +0000 (22:31 +0530)
committerVarun Colbert <vcolbert@nvidia.com>
Tue, 7 Aug 2012 22:23:08 +0000 (15:23 -0700)
commitb8b641f5e81434ebb721b3998218645b5190bc25
treed82cd59ef84d3ddde0478abb38b2f329db87b4da
parente3c885a945febae6e9b2bc1c82863494d5db9a79
Merge commit 'main-jb-2012.08.03-B4' into t114-0806

Conflicts:
arch/arm/boot/compressed/Makefile
arch/arm/boot/compressed/atags_to_fdt.c
arch/arm/boot/compressed/head.S
arch/arm/boot/dts/tegra30.dtsi
arch/arm/include/asm/bug.h
arch/arm/kernel/traps.c
arch/arm/mach-tegra/Makefile.boot
arch/arm/mach-tegra/board-cardhu-sdhci.c
arch/arm/mach-tegra/board-cardhu.c
arch/arm/mach-tegra/board-enterprise-sdhci.c
arch/arm/mach-tegra/board-enterprise.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-kai-sdhci.c
arch/arm/mach-tegra/board-ventana.c
arch/arm/mach-tegra/board-whistler.c
arch/arm/mach-tegra/clock.h
arch/arm/mach-tegra/fuse.h
arch/arm/mach-tegra/tegra2_usb_phy.c
arch/arm/mach-tegra/tegra3_clocks.c
arch/arm/mach-tegra/tegra3_dvfs.c
arch/arm/mach-tegra/tegra3_speedo.c
arch/arm/mach-tegra/timer.c
arch/arm/mach-tegra/usb_phy.c
arch/arm/mach-tegra/wakeups-t3.c
drivers/cpufreq/cpufreq_interactive.c
drivers/input/touchscreen/atmel_mxt_ts.c
drivers/mfd/tps65090.c
drivers/mmc/core/mmc.c
drivers/mmc/host/sdhci-tegra.c
drivers/mmc/host/sdhci.c
drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
drivers/regulator/Kconfig
drivers/regulator/core.c
drivers/regulator/tps80031-regulator.c
drivers/spi/Makefile
drivers/staging/nvec/nvec.c
drivers/tty/serial/Makefile
include/linux/mmc/card.h
sound/soc/tegra/tegra_max98095.c
sound/usb/card.c

Change-Id: I65043bc6ce9e97d0592683462215a39e50f403fd
Reviewed-on: http://git-master/r/121392
Reviewed-by: Bo Yan <byan@nvidia.com>
Tested-by: Bo Yan <byan@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
144 files changed:
arch/arm/Kconfig
arch/arm/boot/compressed/Makefile
arch/arm/boot/compressed/atags_to_fdt.c
arch/arm/boot/dts/tegra20-harmony.dts [moved from arch/arm/boot/dts/tegra-harmony.dts with 100% similarity]
arch/arm/boot/dts/tegra20-seaboard.dts [moved from arch/arm/boot/dts/tegra-seaboard.dts with 100% similarity]
arch/arm/boot/dts/tegra20-ventana.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra20-whistler.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra30-cardhu.dts [new file with mode: 0644]
arch/arm/boot/dts/tegra30-enterprise.dts [new file with mode: 0644]
arch/arm/configs/tegra3_android_defconfig
arch/arm/configs/tegra_android_defconfig
arch/arm/configs/tegra_p1852_android_defconfig [new file with mode: 0644]
arch/arm/configs/tegra_p1852_gnu_linux_defconfig
arch/arm/include/asm/bug.h
arch/arm/kernel/devtree.c
arch/arm/kernel/traps.c
arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-tegra/baseband-xmm-power.c
arch/arm/mach-tegra/baseband-xmm-power.h
arch/arm/mach-tegra/baseband-xmm-power2.c
arch/arm/mach-tegra/board-aruba-panel.c
arch/arm/mach-tegra/board-aruba-sdhci.c
arch/arm/mach-tegra/board-aruba-sensors.c
arch/arm/mach-tegra/board-aruba.c
arch/arm/mach-tegra/board-cardhu-kbc.c
arch/arm/mach-tegra/board-cardhu-panel.c
arch/arm/mach-tegra/board-cardhu-power.c
arch/arm/mach-tegra/board-cardhu-sdhci.c
arch/arm/mach-tegra/board-cardhu.c
arch/arm/mach-tegra/board-cardhu.h
arch/arm/mach-tegra/board-enterprise-pinmux.c
arch/arm/mach-tegra/board-enterprise-power.c
arch/arm/mach-tegra/board-enterprise-sdhci.c
arch/arm/mach-tegra/board-enterprise.c
arch/arm/mach-tegra/board-harmony-panel.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-kai-sdhci.c
arch/arm/mach-tegra/board-p1852-pinmux.c
arch/arm/mach-tegra/board-p1852.c
arch/arm/mach-tegra/board-p1852.h
arch/arm/mach-tegra/board-touch-kai-synaptics-spi.c
arch/arm/mach-tegra/board-touch-raydium_spi.c
arch/arm/mach-tegra/board-ventana.c
arch/arm/mach-tegra/board-whistler.c
arch/arm/mach-tegra/clock.h
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/cpu-tegra3.c
arch/arm/mach-tegra/dvfs.c
arch/arm/mach-tegra/dvfs.h
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/fuse.h
arch/arm/mach-tegra/i2c_error_recovery.c
arch/arm/mach-tegra/include/mach/dc.h
arch/arm/mach-tegra/latency_allowance.c
arch/arm/mach-tegra/tegra2_usb_phy.c
arch/arm/mach-tegra/tegra3_clocks.c [new file with mode: 0644]
arch/arm/mach-tegra/tegra3_dvfs.c
arch/arm/mach-tegra/tegra3_speedo.c
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/tegra_odm_fuses.c
arch/arm/mach-tegra/tegra_usb_modem_power.c
arch/arm/mach-tegra/tegra_usb_phy.h
arch/arm/mach-tegra/timer.c
arch/arm/mach-tegra/timer.h
arch/arm/mach-tegra/usb_phy.c
drivers/ata/Makefile
drivers/cpufreq/cpufreq_interactive.c
drivers/crypto/Makefile
drivers/gpio/Makefile
drivers/gpio/gpio-tegra.c
drivers/hwmon/Makefile
drivers/i2c/busses/Makefile
drivers/input/touchscreen/atmel_mxt_ts.c
drivers/iommu/Makefile
drivers/iommu/tegra-smmu.c
drivers/media/video/tegra/ad5816.c
drivers/media/video/tegra/nvavp/nvavp_dev.c
drivers/media/video/tegra/ov5650.c
drivers/media/video/tegra/ov9726.c
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/tps65090.c
drivers/mfd/tps80031.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/misc/inv_mpu/mpu6050/mldl_cfg.c
drivers/misc/tegra-baseband/bb-power.c
drivers/misc/tegra-cec/Makefile
drivers/misc/tegra-throughput.c [new file with mode: 0644]
drivers/mmc/host/Makefile
drivers/mmc/host/sdhci-tegra.c
drivers/mmc/host/sdhci.c
drivers/mtd/devices/Makefile
drivers/mtd/devices/tegra_nand.c
drivers/net/caif/Makefile
drivers/net/usb/cdc_ether.c
drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
drivers/power/Makefile
drivers/power/tps80031-charger.c
drivers/regulator/Kconfig
drivers/regulator/tps62360-regulator.c
drivers/regulator/tps65090-regulator.c
drivers/regulator/tps80031-regulator.c
drivers/rtc/Makefile
drivers/spi/Makefile
drivers/spi/spi-tegra.c
drivers/spi/spi_slave_tegra.c
drivers/staging/nvec/nvec.c
drivers/tty/serial/Makefile
drivers/usb/gadget/Makefile
drivers/usb/otg/Makefile
drivers/usb/otg/tegra-otg.c
drivers/video/backlight/Makefile
drivers/video/tegra/dc/dc.c
drivers/video/tegra/dc/dc_priv.h
drivers/video/tegra/dc/dsi.c
drivers/video/tegra/dc/ext/dev.c
drivers/video/tegra/dc/mode.c
drivers/video/tegra/host/bus.c
drivers/video/tegra/host/gr3d/scale3d.c
drivers/video/tegra/nvmap/nvmap_ioctl.c
drivers/w1/masters/Makefile
drivers/watchdog/Makefile
drivers/watchdog/tegra_wdt.c
include/linux/mfd/tps65090.h
include/linux/mfd/tps80031.h
include/linux/mmc/host.h
include/linux/nvhost.h
include/linux/platform_data/tegra_usb.h
include/linux/regulator/tps65090-regulator.h
include/linux/regulator/tps80031-regulator.h
include/linux/tegra_nvavp.h
include/linux/throughput_ioctl.h [new file with mode: 0644]
include/media/ov9726.h
include/trace/events/nvevent.h [new file with mode: 0644]
kernel/kthread.c
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.h
sound/pci/hda/hda_eld.c
sound/soc/codecs/max98088.c
sound/soc/tegra/tegra30_i2s.c
sound/soc/tegra/tegra_max98095.c
sound/usb/card.c