Merge branch 'android-tegra-nv-3.1' of git://nv-tegra.nvidia.com/linux-2.6 into android-tegra-nv-2.6.39

Conflicts:
	Documentation/cpu-freq/governors.txt
	Makefile
	arch/arm/Kconfig
	arch/arm/Kconfig.debug
	arch/arm/common/Kconfig
	arch/arm/common/fiq_debugger.c
	arch/arm/common/gic.c
	arch/arm/configs/tegra3_android_defconfig
	arch/arm/configs/tegra3_defconfig
	arch/arm/configs/tegra_android_defconfig
	arch/arm/configs/tegra_aruba2_android_defconfig
	arch/arm/configs/tegra_defconfig
	arch/arm/include/asm/bitops.h
	arch/arm/include/asm/fiq_debugger.h
	arch/arm/include/asm/sizes.h
	arch/arm/kernel/smp_twd.c
	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/baseband-xmm-power2.c
	arch/arm/mach-tegra/board-aruba-panel.c
	arch/arm/mach-tegra/board-aruba.c
	arch/arm/mach-tegra/board-cardhu-kbc.c
	arch/arm/mach-tegra/board-cardhu-memory.c
	arch/arm/mach-tegra/board-cardhu-panel.c
	arch/arm/mach-tegra/board-cardhu-pinmux.c
	arch/arm/mach-tegra/board-cardhu-power.c
	arch/arm/mach-tegra/board-cardhu-powermon.c
	arch/arm/mach-tegra/board-cardhu-sdhci.c
	arch/arm/mach-tegra/board-cardhu-sensors.c
	arch/arm/mach-tegra/board-cardhu.c
	arch/arm/mach-tegra/board-cardhu.h
	arch/arm/mach-tegra/board-enterprise-baseband.c
	arch/arm/mach-tegra/board-enterprise-kbc.c
	arch/arm/mach-tegra/board-enterprise-memory.c
	arch/arm/mach-tegra/board-enterprise-panel.c
	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-sensors.c
	arch/arm/mach-tegra/board-enterprise.c
	arch/arm/mach-tegra/board-enterprise.h
	arch/arm/mach-tegra/board-harmony-kbc.c
	arch/arm/mach-tegra/board-harmony-panel.c
	arch/arm/mach-tegra/board-harmony-pinmux.c
	arch/arm/mach-tegra/board-harmony-power.c
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-harmony.h
	arch/arm/mach-tegra/board-ventana-panel.c
	arch/arm/mach-tegra/board-ventana-pinmux.c
	arch/arm/mach-tegra/board-ventana-power.c
	arch/arm/mach-tegra/board-ventana-sdhci.c
	arch/arm/mach-tegra/board-ventana-sensors.c
	arch/arm/mach-tegra/board-ventana.c
	arch/arm/mach-tegra/board-ventana.h
	arch/arm/mach-tegra/board-whistler-baseband.c
	arch/arm/mach-tegra/board-whistler-baseband.h
	arch/arm/mach-tegra/board-whistler-kbc.c
	arch/arm/mach-tegra/board-whistler-memory.c
	arch/arm/mach-tegra/board-whistler-panel.c
	arch/arm/mach-tegra/board-whistler-pinmux.c
	arch/arm/mach-tegra/board-whistler-power.c
	arch/arm/mach-tegra/board-whistler-sdhci.c
	arch/arm/mach-tegra/board-whistler-sensors.c
	arch/arm/mach-tegra/board-whistler.c
	arch/arm/mach-tegra/board-whistler.h
	arch/arm/mach-tegra/board.h
	arch/arm/mach-tegra/clock.c
	arch/arm/mach-tegra/clock.h
	arch/arm/mach-tegra/common-t2.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-tegra.h
	arch/arm/mach-tegra/cpu-tegra3.c
	arch/arm/mach-tegra/cpuidle-t2.c
	arch/arm/mach-tegra/cpuidle-t3.c
	arch/arm/mach-tegra/cpuidle.c
	arch/arm/mach-tegra/cpuidle.h
	arch/arm/mach-tegra/devices.c
	arch/arm/mach-tegra/devices.h
	arch/arm/mach-tegra/dma.c
	arch/arm/mach-tegra/dvfs.c
	arch/arm/mach-tegra/dvfs.h
	arch/arm/mach-tegra/edp.c
	arch/arm/mach-tegra/fuse.c
	arch/arm/mach-tegra/fuse.h
	arch/arm/mach-tegra/gic.c
	arch/arm/mach-tegra/gic.h
	arch/arm/mach-tegra/gpio-names.h
	arch/arm/mach-tegra/gpio.c
	arch/arm/mach-tegra/headsmp.S
	arch/arm/mach-tegra/i2c_error_recovery.c
	arch/arm/mach-tegra/include/mach/clk.h
	arch/arm/mach-tegra/include/mach/dc.h
	arch/arm/mach-tegra/include/mach/dma.h
	arch/arm/mach-tegra/include/mach/edp.h
	arch/arm/mach-tegra/include/mach/gpio.h
	arch/arm/mach-tegra/include/mach/hdmi-audio.h
	arch/arm/mach-tegra/include/mach/io.h
	arch/arm/mach-tegra/include/mach/iomap.h
	arch/arm/mach-tegra/include/mach/iovmm.h
	arch/arm/mach-tegra/include/mach/irqs.h
	arch/arm/mach-tegra/include/mach/memory.h
	arch/arm/mach-tegra/include/mach/nvmap.h
	arch/arm/mach-tegra/include/mach/pinmux.h
	arch/arm/mach-tegra/include/mach/sdhci.h
	arch/arm/mach-tegra/include/mach/tegra_max98088_pdata.h
	arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
	arch/arm/mach-tegra/include/mach/tsensor.h
	arch/arm/mach-tegra/include/mach/uncompress.h
	arch/arm/mach-tegra/include/mach/usb_phy.h
	arch/arm/mach-tegra/io.c
	arch/arm/mach-tegra/iovmm-gart.c
	arch/arm/mach-tegra/iovmm-smmu.c
	arch/arm/mach-tegra/iovmm.c
	arch/arm/mach-tegra/irq.c
	arch/arm/mach-tegra/kfuse.c
	arch/arm/mach-tegra/latency_allowance.c
	arch/arm/mach-tegra/pcie.c
	arch/arm/mach-tegra/pinmux-t2-tables.c
	arch/arm/mach-tegra/pinmux-t3-tables.c
	arch/arm/mach-tegra/pinmux.c
	arch/arm/mach-tegra/platsmp.c
	arch/arm/mach-tegra/pm-irq.c
	arch/arm/mach-tegra/pm-t2.c
	arch/arm/mach-tegra/pm-t3.c
	arch/arm/mach-tegra/pm.c
	arch/arm/mach-tegra/pm.h
	arch/arm/mach-tegra/powerdetect.c
	arch/arm/mach-tegra/powergate.c
	arch/arm/mach-tegra/reset.c
	arch/arm/mach-tegra/reset.h
	arch/arm/mach-tegra/sleep-t2.S
	arch/arm/mach-tegra/sleep-t3.S
	arch/arm/mach-tegra/sleep.S
	arch/arm/mach-tegra/sleep.h
	arch/arm/mach-tegra/tegra2_clocks.c
	arch/arm/mach-tegra/tegra2_dvfs.c
	arch/arm/mach-tegra/tegra3_actmon.c
	arch/arm/mach-tegra/tegra3_clocks.c
	arch/arm/mach-tegra/tegra3_dvfs.c
	arch/arm/mach-tegra/tegra3_emc.c
	arch/arm/mach-tegra/tegra3_emc.h
	arch/arm/mach-tegra/tegra3_speedo.c
	arch/arm/mach-tegra/tegra3_tsensor.c
	arch/arm/mach-tegra/tegra_odm_fuses.c
	arch/arm/mach-tegra/timer-t2.c
	arch/arm/mach-tegra/timer-t3.c
	arch/arm/mach-tegra/timer.c
	arch/arm/mach-tegra/timer.h
	arch/arm/mach-tegra/usb_phy.c
	arch/arm/mach-tegra/wakeups-t2.c
	arch/arm/mach-tegra/wakeups-t3.c
	arch/arm/mm/Makefile
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/cache-v7.S
	arch/arm/mm/mmu.c
	arch/arm/mm/pageattr.c
	arch/arm/mm/proc-v7.S
	arch/arm/tools/mach-types
	arch/arm/vfp/vfpmodule.c
	arch/parisc/include/asm/unistd.h
	arch/parisc/kernel/syscall_table.S
	arch/powerpc/kernel/crash.c
	arch/powerpc/kernel/head_32.S
	arch/tile/kernel/pci.c
	arch/x86/include/asm/pvclock.h
	arch/x86/kernel/amd_iommu.c
	arch/x86/kernel/amd_iommu_init.c
	arch/x86/kernel/apic/io_apic.c
	arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c
	arch/x86/kernel/reboot.c
	arch/x86/lib/copy_user_64.S
	arch/x86/oprofile/op_model_amd.c
	arch/x86/pci/xen.c
	arch/x86/xen/multicalls.c
	arch/x86/xen/p2m.c
	arch/x86/xen/setup.c
	block/blk.h
	drivers/Makefile
	drivers/ata/pata_cmd64x.c
	drivers/base/power/main.c
	drivers/block/brd.c
	drivers/block/loop.c
	drivers/block/nbd.c
	drivers/bluetooth/Kconfig
	drivers/bluetooth/bluesleep.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/cpufreq.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/cpufreq/cpufreq_stats.c
	drivers/crypto/Kconfig
	drivers/crypto/Makefile
	drivers/crypto/tegra-aes.c
	drivers/crypto/tegra-se.c
	drivers/gpu/drm/i915/i915_irq.c
	drivers/gpu/drm/i915/intel_ringbuffer.c
	drivers/gpu/drm/radeon/radeon_display.c
	drivers/gpu/drm/radeon/rv770.c
	drivers/hid/Kconfig
	drivers/hid/hid-magicmouse.c
	drivers/hid/hid-multitouch.c
	drivers/hwmon/Kconfig
	drivers/hwmon/Makefile
	drivers/hwmon/adt7461.c
	drivers/hwmon/coretemp.c
	drivers/hwmon/lm95241.c
	drivers/hwmon/max1111.c
	drivers/hwmon/pmbus.c
	drivers/hwmon/pmbus_core.c
	drivers/hwmon/tegra-tsensor.c
	drivers/i2c/busses/i2c-slave-tegra.c
	drivers/i2c/busses/i2c-tegra.c
	drivers/i2c/i2c-slave.c
	drivers/input/evdev.c
	drivers/input/keyboard/gpio_keys.c
	drivers/input/misc/Kconfig
	drivers/input/misc/gpio_input.c
	drivers/input/misc/gpio_matrix.c
	drivers/input/touchscreen/atmel_mxt_ts.c
	drivers/input/touchscreen/synaptics_i2c_rmi.c
	drivers/md/md.c
	drivers/md/raid5.c
	drivers/media/video/tegra/Kconfig
	drivers/media/video/tegra/Makefile
	drivers/media/video/tegra/ad5820.c
	drivers/media/video/tegra/ar0832_main.c
	drivers/media/video/tegra/avp/Makefile
	drivers/media/video/tegra/avp/avp.c
	drivers/media/video/tegra/avp/avp_svc.c
	drivers/media/video/tegra/mediaserver/Makefile
	drivers/media/video/tegra/mediaserver/tegra_mediaserver.c
	drivers/media/video/tegra/nvavp/Kconfig
	drivers/media/video/tegra/nvavp/Makefile
	drivers/media/video/tegra/nvavp/nvavp_dev.c
	drivers/media/video/tegra/nvavp/nvavp_os.h
	drivers/media/video/tegra/ov2710.c
	drivers/media/video/tegra/ov5650.c
	drivers/media/video/tegra/ov9726.c
	drivers/media/video/tegra/sh532u.c
	drivers/media/video/tegra/soc380.c
	drivers/media/video/tegra/ssl3250a.c
	drivers/media/video/tegra/tegra_camera.c
	drivers/media/video/tegra/tps61050.c
	drivers/media/video/tuner-core.c
	drivers/mfd/Kconfig
	drivers/mfd/Makefile
	drivers/mfd/max77663-core.c
	drivers/mfd/max8907c.c
	drivers/mfd/omap-usb-host.c
	drivers/mfd/ricoh583.c
	drivers/mfd/tps6586x.c
	drivers/mfd/tps6591x.c
	drivers/mfd/tps80031.c
	drivers/mfd/twl-core.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/mpu3050/accel/kxtf9.c
	drivers/misc/mpu3050/mpu-dev.c
	drivers/misc/nct1008.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/mmc_ops.c
	drivers/mmc/core/quirks.c
	drivers/mmc/host/sdhci-pltfm.c
	drivers/mmc/host/sdhci-tegra.c
	drivers/mmc/host/sdhci.c
	drivers/mmc/host/sdhci.h
	drivers/mtd/devices/tegra_nand.c
	drivers/net/Makefile
	drivers/net/caif/Kconfig
	drivers/net/caif/Makefile
	drivers/net/usb/raw_ip_net.c
	drivers/net/wireless/Makefile
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath5k/eeprom.c
	drivers/net/wireless/ath/ath5k/pci.c
	drivers/net/wireless/ath/ath5k/reset.c
	drivers/net/wireless/ath/ath5k/sysfs.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/bcm4329/Kconfig
	drivers/net/wireless/bcm4329/Makefile
	drivers/net/wireless/bcm4329/bcmsdh_linux.c
	drivers/net/wireless/bcm4329/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcm4329/dhd.h
	drivers/net/wireless/bcm4329/dhd_cdc.c
	drivers/net/wireless/bcm4329/dhd_linux.c
	drivers/net/wireless/bcm4329/dhd_sdio.c
	drivers/net/wireless/bcm4329/include/bcmsdh.h
	drivers/net/wireless/bcm4329/linux_osl.c
	drivers/net/wireless/bcm4329/wl_iw.c
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmsdh.c
	drivers/net/wireless/bcmdhd/bcmsdh_linux.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_bus.h
	drivers/net/wireless/bcmdhd/dhd_cdc.c
	drivers/net/wireless/bcmdhd/dhd_common.c
	drivers/net/wireless/bcmdhd/dhd_dbg.h
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_linux_mon.c
	drivers/net/wireless/bcmdhd/dhd_linux_sched.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/dhd_wlfc.h
	drivers/net/wireless/bcmdhd/include/bcmsdh.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/linuxver.h
	drivers/net/wireless/bcmdhd/include/sdio.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/linux_osl.c
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.h
	drivers/net/wireless/bcmdhd/wl_iw.c
	drivers/net/wireless/bcmdhd/wl_iw.h
	drivers/net/wireless/bcmdhd/wldev_common.c
	drivers/net/wireless/bcmdhd/wldev_common.h
	drivers/net/wireless/iwlegacy/iwl-4965.c
	drivers/net/wireless/iwlegacy/iwl-dev.h
	drivers/net/wireless/iwlegacy/iwl4965-base.c
	drivers/net/wireless/iwlwifi/iwl-2000.c
	drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/zd1211rw/zd_usb.c
	drivers/pci/hotplug/pcihp_slot.c
	drivers/pci/intel-iommu.c
	drivers/pci/iova.c
	drivers/pci/quirks.c
	drivers/power/Kconfig
	drivers/power/Makefile
	drivers/power/bq27x00_battery.c
	drivers/power/tps80031-charger.c
	drivers/power/tps80031_battery_gauge.c
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
	drivers/regulator/aat2870-regulator.c
	drivers/regulator/core.c
	drivers/regulator/gpio-switch-regulator.c
	drivers/regulator/max77663-regulator.c
	drivers/regulator/ricoh583-regulator.c
	drivers/regulator/tps6591x-regulator.c
	drivers/regulator/tps80031-regulator.c
	drivers/regulator/twl-regulator.c
	drivers/rtc/Kconfig
	drivers/rtc/Makefile
	drivers/rtc/alarm.c
	drivers/rtc/class.c
	drivers/rtc/rtc-max77663.c
	drivers/rtc/rtc-max8907c.c
	drivers/rtc/rtc-tps6586x.c
	drivers/rtc/rtc-tps6591x.c
	drivers/rtc/rtc-tps80031.c
	drivers/spi/Makefile
	drivers/spi/spi_slave_tegra.c
	drivers/spi/spi_tegra.c
	drivers/staging/android/lowmemorykiller.c
	drivers/staging/android/ram_console.c
	drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
	drivers/staging/gma500/psb_fb.c
	drivers/staging/iio/light/Kconfig
	drivers/staging/iio/light/Makefile
	drivers/staging/iio/light/isl29028.c
	drivers/switch/switch_class.c
	drivers/target/target_core_device.c
	drivers/target/target_core_tmr.c
	drivers/target/target_core_transport.c
	drivers/tty/serial/8250.c
	drivers/tty/serial/8250.h
	drivers/tty/serial/tegra_hsuart.c
	drivers/tty/tty_ldisc.c
	drivers/usb/class/cdc-acm.c
	drivers/usb/class/cdc-acm.h
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/android.c
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/f_accessory.c
	drivers/usb/gadget/f_acm.c
	drivers/usb/gadget/f_adb.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/f_mtp.c
	drivers/usb/gadget/f_rndis.c
	drivers/usb/gadget/fsl_tegra_udc.c
	drivers/usb/gadget/fsl_udc_core.c
	drivers/usb/host/ehci-tegra.c
	drivers/usb/host/ehci.h
	drivers/usb/host/ohci-pci.c
	drivers/usb/host/xhci-dbg.c
	drivers/usb/host/xhci-pci.c
	drivers/usb/host/xhci.c
	drivers/usb/host/xhci.h
	drivers/usb/otg/tegra-otg.c
	drivers/usb/serial/baseband_usb_chr.c
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/garmin_gps.c
	drivers/usb/serial/option.c
	drivers/usb/serial/pl2303.c
	drivers/usb/serial/pl2303.h
	drivers/usb/storage/usb.c
	drivers/video/backlight/Kconfig
	drivers/video/backlight/aat2870_bl.c
	drivers/video/backlight/tegra_pwm_bl.c
	drivers/video/fbmon.c
	drivers/video/tegra/Kconfig
	drivers/video/tegra/Makefile
	drivers/video/tegra/dc/Makefile
	drivers/video/tegra/dc/dc.c
	drivers/video/tegra/dc/dc_priv.h
	drivers/video/tegra/dc/dc_reg.h
	drivers/video/tegra/dc/dc_sysfs.c
	drivers/video/tegra/dc/dsi.c
	drivers/video/tegra/dc/dsi.h
	drivers/video/tegra/dc/dsi_regs.h
	drivers/video/tegra/dc/edid.c
	drivers/video/tegra/dc/edid.h
	drivers/video/tegra/dc/ext/control.c
	drivers/video/tegra/dc/ext/dev.c
	drivers/video/tegra/dc/ext/tegra_dc_ext_priv.h
	drivers/video/tegra/dc/hdmi.c
	drivers/video/tegra/dc/hdmi_reg.h
	drivers/video/tegra/dc/nvhdcp.h
	drivers/video/tegra/dc/nvsd.c
	drivers/video/tegra/dc/rgb.c
	drivers/video/tegra/fb.c
	drivers/video/tegra/host/Makefile
	drivers/video/tegra/host/bus.c
	drivers/video/tegra/host/chip_support.h
	drivers/video/tegra/host/debug.c
	drivers/video/tegra/host/debug.h
	drivers/video/tegra/host/dev.c
	drivers/video/tegra/host/dev.h
	drivers/video/tegra/host/nvhost_acm.c
	drivers/video/tegra/host/nvhost_acm.h
	drivers/video/tegra/host/nvhost_cdma.c
	drivers/video/tegra/host/nvhost_cdma.h
	drivers/video/tegra/host/nvhost_channel.c
	drivers/video/tegra/host/nvhost_channel.h
	drivers/video/tegra/host/nvhost_hwctx.h
	drivers/video/tegra/host/nvhost_intr.c
	drivers/video/tegra/host/nvhost_intr.h
	drivers/video/tegra/host/nvhost_syncpt.c
	drivers/video/tegra/host/nvhost_syncpt.h
	drivers/video/tegra/host/t20/Makefile
	drivers/video/tegra/host/t20/t20.c
	drivers/video/tegra/host/t20/t20.h
	drivers/video/tegra/host/t30/Makefile
	drivers/video/tegra/host/t30/t30.c
	drivers/video/tegra/host/t30/t30.h
	drivers/video/tegra/nvmap/Makefile
	drivers/video/tegra/nvmap/nvmap.c
	drivers/video/tegra/nvmap/nvmap.h
	drivers/video/tegra/nvmap/nvmap_dev.c
	drivers/video/tegra/nvmap/nvmap_handle.c
	drivers/video/tegra/nvmap/nvmap_ioctl.c
	drivers/video/tegra/nvmap/nvmap_mru.c
	drivers/watchdog/Kconfig
	drivers/watchdog/tegra_wdt.c
	fs/cifs/connect.c
	fs/cifs/fscache.c
	fs/ext4/ext4.h
	fs/ext4/super.c
	fs/hfsplus/wrapper.c
	fs/locks.c
	fs/namei.c
	fs/proc/base.c
	fs/xfs/xfs_alloc.c
	include/drm/drm_pciids.h
	include/linux/adt7461.h
	include/linux/blk_types.h
	include/linux/fsl_devices.h
	include/linux/gpio_event.h
	include/linux/gpio_keys.h
	include/linux/i2c-tegra.h
	include/linux/i2c/atmel_mxt_ts.h
	include/linux/mfd/max77663-core.h
	include/linux/mfd/max8907c.h
	include/linux/mfd/ricoh583.h
	include/linux/mfd/tps6591x.h
	include/linux/mfd/tps80031.h
	include/linux/mmc/card.h
	include/linux/mmc/core.h
	include/linux/mmc/host.h
	include/linux/mpu.h
	include/linux/nct1008.h
	include/linux/nvhost.h
	include/linux/nvhost_ioctl.h
	include/linux/platform_data/tegra_usb.h
	include/linux/pm_qos_params.h
	include/linux/regulator/max77663-regulator.h
	include/linux/regulator/ricoh583-regulator.h
	include/linux/regulator/tps6236x-regulator.h
	include/linux/regulator/tps6591x-regulator.h
	include/linux/regulator/tps80031-regulator.h
	include/linux/tegra_audio.h
	include/linux/tegra_pwm_bl.h
	include/linux/tegra_uart.h
	include/linux/usb/composite.h
	include/linux/usb/f_accessory.h
	include/linux/usb/f_mtp.h
	include/media/ar0832_main.h
	include/media/ov5650.h
	include/media/ov9726.h
	include/media/sh532u.h
	include/media/ssl3250a.h
	include/media/tps61050.h
	include/net/bluetooth/bluetooth.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/l2cap.h
	include/target/target_core_base.h
	include/trace/events/nvhost.h
	include/video/tegra_dc_ext.h
	init/calibrate.c
	kernel/cgroup.c
	kernel/irq/irqdesc.c
	kernel/irq/pm.c
	kernel/pm_qos_params.c
	kernel/power/Makefile
	kernel/power/earlysuspend.c
	kernel/power/wakelock.c
	kernel/sched_fair.c
	kernel/taskstats.c
	kernel/trace/Kconfig
	kernel/trace/Makefile
	lib/Kconfig.debug
	mm/ashmem.c
	mm/memory-failure.c
	mm/page_alloc.c
	mm/shmem.c
	mm/vmscan.c
	net/Makefile
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bridge/br_netfilter.c
	net/core/filter.c
	net/ipv4/af_inet.c
	net/ipv4/inetpeer.c
	net/ipv4/netfilter.c
	net/ipv4/tcp.c
	net/mac80211/mlme.c
	net/mac80211/wpa.c
	net/netfilter/Makefile
	net/netfilter/ipvs/ip_vs_core.c
	net/netfilter/xt_qtaguid.c
	net/packet/af_packet.c
	net/sched/sch_sfq.c
	net/sctp/associola.c
	net/sctp/bind_addr.c
	net/socket.c
	net/wireless/nl80211.c
	sound/pci/hda/hda_intel.c
	sound/pci/hda/patch_realtek.c
	sound/soc/codecs/ad1836.h
	sound/soc/codecs/max98088.c
	sound/soc/codecs/wm8994.c
	sound/soc/tegra/Kconfig
	sound/soc/tegra/Makefile
	sound/soc/tegra/tegra20_das.c
	sound/soc/tegra/tegra20_das.h
	sound/soc/tegra/tegra20_i2s.c
	sound/soc/tegra/tegra20_i2s.h
	sound/soc/tegra/tegra20_spdif.c
	sound/soc/tegra/tegra20_spdif.h
	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/tegra30_spdif.c
	sound/soc/tegra/tegra30_spdif.h
	sound/soc/tegra/tegra_asoc_utils.c
	sound/soc/tegra/tegra_asoc_utils.h
	sound/soc/tegra/tegra_max98088.c
	sound/soc/tegra/tegra_pcm.c
	sound/soc/tegra/tegra_wm8753.c
	sound/soc/tegra/tegra_wm8903.c
	virt/kvm/assigned-dev.c

Conflicts:
	arch/arm/common/gic.c
	arch/arm/configs/tegra3_android_defconfig
	arch/arm/configs/tegra3_defconfig
	arch/arm/configs/tegra_android_defconfig
	arch/arm/configs/tegra_cardhu_mods_defconfig
	arch/arm/configs/tegra_cardhu_mods_ldk_defconfig
	arch/arm/configs/tegra_defconfig
	arch/arm/configs/tegra_p852_gnu_linux_defconfig
	arch/arm/include/asm/hwcap.h
	arch/arm/include/asm/sizes.h
	arch/arm/kernel/process.c
	arch/arm/kernel/setup.c
	arch/arm/mach-tegra/Kconfig
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/baseband-xmm-power.c
	arch/arm/mach-tegra/board-aruba-panel.c
	arch/arm/mach-tegra/board-cardhu-kbc.c
	arch/arm/mach-tegra/board-cardhu-memory.c
	arch/arm/mach-tegra/board-cardhu-panel.c
	arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c
	arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c
	arch/arm/mach-tegra/board-cardhu-power.c
	arch/arm/mach-tegra/board-cardhu-sensors.c
	arch/arm/mach-tegra/board-cardhu.c
	arch/arm/mach-tegra/board-cardhu.h
	arch/arm/mach-tegra/board-enterprise-baseband.c
	arch/arm/mach-tegra/board-enterprise-kbc.c
	arch/arm/mach-tegra/board-enterprise-panel.c
	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-sensors.c
	arch/arm/mach-tegra/board-enterprise.c
	arch/arm/mach-tegra/board-enterprise.h
	arch/arm/mach-tegra/board-harmony-panel.c
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-kai-kbc.c
	arch/arm/mach-tegra/board-kai-memory.c
	arch/arm/mach-tegra/board-kai-panel.c
	arch/arm/mach-tegra/board-kai-pinmux.c
	arch/arm/mach-tegra/board-kai-power.c
	arch/arm/mach-tegra/board-kai-sdhci.c
	arch/arm/mach-tegra/board-kai.c
	arch/arm/mach-tegra/board-kai.h
	arch/arm/mach-tegra/board-p1852-panel.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-seaboard.c
	arch/arm/mach-tegra/board-touch-kai-synaptics-spi.c
	arch/arm/mach-tegra/board-trimslice.c
	arch/arm/mach-tegra/board-ventana-panel.c
	arch/arm/mach-tegra/board-ventana-power.c
	arch/arm/mach-tegra/board-ventana-sensors.c
	arch/arm/mach-tegra/board-ventana.c
	arch/arm/mach-tegra/board-ventana.h
	arch/arm/mach-tegra/board-whistler-panel.c
	arch/arm/mach-tegra/board-whistler-pinmux.c
	arch/arm/mach-tegra/board-whistler.c
	arch/arm/mach-tegra/board.h
	arch/arm/mach-tegra/clock.h
	arch/arm/mach-tegra/common.c
	arch/arm/mach-tegra/cpu-tegra.c
	arch/arm/mach-tegra/cpu-tegra3.c
	arch/arm/mach-tegra/cpuidle-t3.c
	arch/arm/mach-tegra/devices.c
	arch/arm/mach-tegra/devices.h
	arch/arm/mach-tegra/fuse.c
	arch/arm/mach-tegra/gpio.c
	arch/arm/mach-tegra/headsmp.S
	arch/arm/mach-tegra/include/mach/dc.h
	arch/arm/mach-tegra/include/mach/gpio.h
	arch/arm/mach-tegra/include/mach/hardware.h
	arch/arm/mach-tegra/include/mach/hdmi-audio.h
	arch/arm/mach-tegra/include/mach/io.h
	arch/arm/mach-tegra/include/mach/iovmm.h
	arch/arm/mach-tegra/include/mach/nvmap.h
	arch/arm/mach-tegra/include/mach/sdhci.h
	arch/arm/mach-tegra/iovmm-smmu.c
	arch/arm/mach-tegra/p852/board-p852-panel.c
	arch/arm/mach-tegra/p852/board-p852-power.c
	arch/arm/mach-tegra/p852/board-p852.c
	arch/arm/mach-tegra/p852/board-p852.h
	arch/arm/mach-tegra/pcie.c
	arch/arm/mach-tegra/pinmux-t2-tables.c
	arch/arm/mach-tegra/pm-irq.c
	arch/arm/mach-tegra/pm.c
	arch/arm/mach-tegra/sleep-t3.S
	arch/arm/mach-tegra/tegra2_clocks.c
	arch/arm/mach-tegra/tegra3_clocks.c
	arch/arm/mach-tegra/tegra3_dvfs.c
	arch/arm/mach-tegra/tegra3_emc.c
	arch/arm/mach-tegra/tegra3_emc.h
	arch/arm/mach-tegra/tegra3_thermal.c
	arch/arm/mach-tegra/tegra3_tsensor.c
	arch/arm/mach-tegra/tegra_usb_modem_power.c
	arch/arm/mach-tegra/timer-t3.c
	arch/arm/mach-tegra/usb_phy.c
	arch/arm/mach-tegra/wakeups-t2.c
	arch/arm/mm/pageattr.c
	arch/arm/mm/proc-v7.S
	arch/arm/tools/mach-types
	arch/arm/vfp/vfphw.S
	arch/arm/vfp/vfpmodule.c
	drivers/Kconfig
	drivers/Makefile
	drivers/base/power/main.c
	drivers/base/regmap/Kconfig
	drivers/base/regmap/Makefile
	drivers/base/regmap/regmap-i2c.c
	drivers/base/regmap/regmap-spi.c
	drivers/base/regmap/regmap.c
	drivers/bluetooth/bluesleep.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/cpufreq.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/hid/hid-input.c
	drivers/hid/hid-magicmouse.c
	drivers/i2c/busses/i2c-slave-tegra.c
	drivers/i2c/busses/i2c-tegra.c
	drivers/input/keyboard/gpio_keys.c
	drivers/input/keyboard/tegra-kbc.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/input/touchscreen/atmel_mxt_ts.c
	drivers/media/video/tegra/Kconfig
	drivers/media/video/tegra/Makefile
	drivers/media/video/tegra/ar0832_main.c
	drivers/media/video/tegra/nvavp/nvavp_dev.c
	drivers/media/video/tegra/ov14810.c
	drivers/media/video/tegra/tegra_camera.c
	drivers/media/video/tegra/tegra_dtv.c
	drivers/mfd/Kconfig
	drivers/mfd/max77663-core.c
	drivers/mfd/max8907c.c
	drivers/mfd/tps80031.c
	drivers/mfd/wm8994-core.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/inv_mpu/Kconfig
	drivers/misc/inv_mpu/Makefile
	drivers/misc/inv_mpu/compass/Kconfig
	drivers/misc/inv_mpu/compass/Makefile
	drivers/misc/inv_mpu/mldl_cfg.h
	drivers/misc/inv_mpu/mpuirq.c
	drivers/misc/inv_mpu/mpuirq.h
	drivers/misc/inv_mpu/slaveirq.c
	drivers/misc/mpu3050/mpu-dev.c
	drivers/misc/nct1008.c
	drivers/misc/ti-st/st_kim.c
	drivers/misc/ti-st/st_ll.c
	drivers/mmc/card/block.c
	drivers/mmc/card/queue.c
	drivers/mmc/core/bus.c
	drivers/mmc/core/core.c
	drivers/mmc/core/core.h
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sd.c
	drivers/mmc/core/sdio.c
	drivers/mmc/host/sdhci-tegra.c
	drivers/mmc/host/sdhci.c
	drivers/mmc/host/sdhci.h
	drivers/mtd/maps/Makefile
	drivers/mtd/maps/tegra_nor.c
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/raw_ip_net.c
	drivers/net/wireless/Makefile
	drivers/net/wireless/bcm4329.lge/src/shared/linux_osl.org.c
	drivers/net/wireless/bcm4329/Kconfig
	drivers/net/wireless/bcm4329/Makefile
	drivers/net/wireless/bcm4329/src/dhd/sys/dhd_linux.c
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmsdh_linux.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_iw.c
	drivers/power/Makefile
	drivers/power/bq20z75.c
	drivers/power/max17048_battery.c
	drivers/power/smb349-charger.c
	drivers/power/tegra_bpc_mgmt.c
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
	drivers/regulator/core.c
	drivers/regulator/max77663-regulator.c
	drivers/regulator/max8952.c
	drivers/rtc/Kconfig
	drivers/rtc/rtc-tps80031.c
	drivers/spi/Makefile
	drivers/spi/spi_tegra.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/android/ram_console.c
	drivers/tty/serial/8250.c
	drivers/tty/serial/serial_core.c
	drivers/tty/serial/tegra_hsuart.c
	drivers/usb/class/cdc-acm.c
	drivers/usb/class/cdc-acm.h
	drivers/usb/gadget/android.c
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/f_adb.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/f_rndis.c
	drivers/usb/gadget/fsl_udc_core.c
	drivers/usb/gadget/fsl_usb2_udc.h
	drivers/usb/gadget/gadget_chips.h
	drivers/usb/host/ehci-tegra.c
	drivers/usb/otg/tegra-otg.c
	drivers/usb/serial/baseband_usb_chr.c
	drivers/video/backlight/Kconfig
	drivers/video/tegra/Kconfig
	drivers/video/tegra/dc/dc.c
	drivers/video/tegra/dc/dc_priv.h
	drivers/video/tegra/dc/dsi.c
	drivers/video/tegra/dc/dsi.h
	drivers/video/tegra/dc/edid.c
	drivers/video/tegra/dc/hdmi.c
	drivers/video/tegra/fb.c
	drivers/video/tegra/host/Makefile
	drivers/video/tegra/host/bus_client.c
	drivers/video/tegra/host/bus_client.h
	drivers/video/tegra/host/chip_support.h
	drivers/video/tegra/host/debug.c
	drivers/video/tegra/host/dev.c
	drivers/video/tegra/host/dev.h
	drivers/video/tegra/host/gr3d/scale3d.c
	drivers/video/tegra/host/host1x/host1x_cdma.h
	drivers/video/tegra/host/host1x/host1x_channel.h
	drivers/video/tegra/host/mpe/mpe.c
	drivers/video/tegra/host/nvhost_acm.c
	drivers/video/tegra/host/nvhost_cdma.c
	drivers/video/tegra/host/nvhost_cdma.h
	drivers/video/tegra/host/nvhost_channel.c
	drivers/video/tegra/host/nvhost_channel.h
	drivers/video/tegra/host/nvhost_hwctx.h
	drivers/video/tegra/host/nvhost_intr.c
	drivers/video/tegra/host/nvhost_job.c
	drivers/video/tegra/host/nvhost_job.h
	drivers/video/tegra/host/nvhost_syncpt.c
	drivers/video/tegra/host/nvhost_syncpt.h
	drivers/video/tegra/host/t20/t20.c
	drivers/video/tegra/host/t30/t30.c
	drivers/video/tegra/nvmap/nvmap.h
	drivers/video/tegra/nvmap/nvmap_dev.c
	drivers/video/tegra/nvmap/nvmap_handle.c
	drivers/watchdog/Makefile
	include/linux/fb.h
	include/linux/input.h
	include/linux/max17048_battery.h
	include/linux/mfd/max77663-core.h
	include/linux/mfd/tps80031.h
	include/linux/mmc/card.h
	include/linux/mmc/host.h
	include/linux/mmc/mmc.h
	include/linux/mmc/sdhci-pltfm.h
	include/linux/mmc/sdhci.h
	include/linux/mpu.h
	include/linux/nct1008.h
	include/linux/nvhost.h
	include/linux/regmap.h
	include/linux/smb349-charger.h
	include/linux/tegra_audio.h
	include/linux/ti_wilink_st.h
	include/linux/tty.h
	include/linux/usb/composite.h
	include/media/ar0832_main.h
	include/media/nvc.h
	include/media/nvc_focus.h
	include/media/tegra_dtv.h
	include/net/caif/caif_dev.h
	include/net/caif/caif_hsi.h
	include/net/caif/cfcnfg.h
	include/sound/soc.h
	include/trace/events/nvhost.h
	include/video/tegra_dc_ext.h
	kernel/pm_qos_params.c
	kernel/power/Kconfig
	kernel/power/suspend.c
	kernel/power/wakelock.c
	kernel/sched.c
	kernel/sched_rt.c
	kernel/trace/tracedump.c
	net/caif/Makefile
	net/caif/caif_dev.c
	net/caif/cfcnfg.c
	net/caif/cfctrl.c
	net/caif/cffrml.c
	net/ipv6/route.c
	security/tf_driver/Makefile
	security/tf_driver/s_version.h
	security/tf_driver/tf_comm.c
	security/tf_driver/tf_comm_tz.c
	security/tf_driver/tf_device.c
	security/tf_driver/tf_protocol.h
	sound/pci/hda/hda_codec.c
	sound/pci/hda/hda_eld.c
	sound/pci/hda/hda_intel.c
	sound/pci/hda/patch_hdmi.c
	sound/soc/codecs/rt5639.c
	sound/soc/codecs/rt5639.h
	sound/soc/codecs/rt5640.c
	sound/soc/codecs/rt5640.h
	sound/soc/codecs/wm8994.c
	sound/soc/soc-core.c
	sound/soc/soc-jack.c
	sound/soc/tegra/Makefile
	sound/soc/tegra/tegra20_das.c
	sound/soc/tegra/tegra20_i2s.c
	sound/soc/tegra/tegra30_dam.c
	sound/soc/tegra/tegra30_dam.h
	sound/soc/tegra/tegra_aic326x.c
	sound/soc/tegra/tegra_max98088.c
	sound/soc/tegra/tegra_pcm.c
	sound/soc/tegra/tegra_rt5640.c
	sound/soc/tegra/tegra_wm8903.c