Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
  ARM: tegra: harmony: initialize the TPS65862 PMIC
  ARM: tegra: update defconfig
  ARM: tegra: harmony: update PCI-e initialization sequence
  ARM: tegra: trimslice: enable MMC/SD slots
  ARM: tegra: enable new drivers in defconfig
  ARM: tegra: Add Toshiba AC100 support
  ARM: tegra: harmony: Set WM8903 gpio_base
  ARM: tegra: harmony: I2C-related portions of audio support
  ARM: tegra: harmony: register i2c devices
  ARM: tegra: seaboard: register i2c devices
  ARM: tegra: harmony: Beginnings of audio support
  ARM: tegra: create defines for SD-related GPIO names
  ARM: tegra: add devices.c entries for audio

diff --combined arch/arm/mach-tegra/Kconfig
index 622a9ec,8df6499..3cdeffc
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -10,9 -10,6 +10,9 @@@ config ARCH_TEGRA_2x_SO
        select CPU_V7
        select ARM_GIC
        select ARCH_REQUIRE_GPIOLIB
 +      select USB_ARCH_HAS_EHCI if USB_SUPPORT
 +      select USB_ULPI if USB_SUPPORT
 +      select USB_ULPI_VIEWPORT if USB_SUPPORT
        help
          Support for NVIDIA Tegra AP20 and T20 processors, based on the
          ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@@ -36,6 -33,11 +36,11 @@@ config MACH_KAE
         help
           Support for the Kaen version of Seaboard
  
+ config MACH_PAZ00
+        bool "Paz00 board"
+        help
+          Support for the Toshiba AC100/Dynabook AZ netbook
+ 
  config MACH_SEABOARD
         bool "Seaboard board"
         help

diff --combined arch/arm/mach-tegra/Makefile
index 9f7a7e1,bbe1dbe..1afe050
--- 1/arch/arm/mach-tegra/Makefile
--- 2/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -17,11 -17,14 +17,15 @@@ obj-$(CONFIG_HOTPLUG_CPU
  obj-$(CONFIG_TEGRA_SYSTEM_DMA)                += dma.o
  obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
  obj-$(CONFIG_TEGRA_PCI)                       += pcie.o
 +obj-$(CONFIG_USB_SUPPORT)             += usb_phy.o
  
  obj-${CONFIG_MACH_HARMONY}              += board-harmony.o
  obj-${CONFIG_MACH_HARMONY}              += board-harmony-pinmux.o
  obj-${CONFIG_MACH_HARMONY}              += board-harmony-pcie.o
+ obj-${CONFIG_MACH_HARMONY}              += board-harmony-power.o
+ 
+ obj-${CONFIG_MACH_PAZ00}              += board-paz00.o
+ obj-${CONFIG_MACH_PAZ00}              += board-paz00-pinmux.o
  
  obj-${CONFIG_MACH_SEABOARD}             += board-seaboard.o
  obj-${CONFIG_MACH_SEABOARD}             += board-seaboard-pinmux.o