diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:55:47 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:55:47 +0100 |
| commit | e195ffbe4573f79d590e63e2ae32dac2a73d5768 (patch) | |
| tree | 3dbf31c376324923c2dc90cefe462ed6b01f9070 /arch/arm/mach-msm/devices-msm8960.c | |
| parent | Merge branches 'depends/rmk/devel-stable' and 'tegra/dt' into next/soc (diff) | |
| parent | Merge branch 'for-3.3/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/o... (diff) | |
| download | linux-e195ffbe4573f79d590e63e2ae32dac2a73d5768.tar.xz linux-e195ffbe4573f79d590e63e2ae32dac2a73d5768.zip | |
Merge branch 'tegra/soc' into next/soc
* tegra/soc:
arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF
arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC
arm/tegra: Delete tegra_init_clock()
arm/tegra: Fix section mismatch errors in tegra30 pinmux
arm/tegra: Fix section mismatch errors in tegra20 pinmux
arm/tegra: refresh defconfig for tegra30
arm/tegra: add support for tegra30 based board cardhu
arm/tegra: implement support for tegra30
arm/tegra: pinmux tables and definitions for tegra30
arm/tegra: add new fields to struct tegra_pingroup_desc
arm/tegra: prepare pinmux code for multiple tegra variants
arm/tegra: rename tegra20 pinmux files
arm/tegra: generalize L2 cache initialization
arm/tegra: use PMC reset
arm/tegra: rename board-dt.c to board-dt-tegra20.c
arm/tegra: prepare early init for multiple tegra variants
arm/tegra: don't export clk_measure_input_freq
arm/tegra: prepare clock code for multiple tegra variants
arm/tegra: cleanup tegra20 support
arm/tegra: clk_get should not be fatal
Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
Diffstat (limited to 'arch/arm/mach-msm/devices-msm8960.c')
0 files changed, 0 insertions, 0 deletions