Merge branch 'for-next/tegra'
Conflicts:
	arch/arm/dts/tegra20-colibri.dtsi
	arch/arm/dts/tegra20-paz00.dts
	arch/arm/dts/tegra20.dtsi
	drivers/clk/tegra/clk-periph.c
commit 7b7631791ed9cad14ed0f54376049fab8807ea2c
2 parents cdfca5d + 4c13cf9
@Sascha Hauer Sascha Hauer authored on 5 May 2014
Showing 28 changed files
View
arch/arm/boards/Makefile
View
arch/arm/boards/nvidia-beaver/Makefile 0 → 100644
View
arch/arm/boards/nvidia-beaver/entry.c 0 → 100644
View
arch/arm/boards/toradex-colibri-t20/Makefile
View
arch/arm/boards/toshiba-ac100/Makefile
View
arch/arm/configs/tegra_v7_defconfig
View
arch/arm/dts/Makefile
View
arch/arm/dts/tegra20-colibri-iris.dts
View
arch/arm/dts/tegra30-beaver.dts 0 → 100644
View
arch/arm/dts/tegra30.dtsi 0 → 100644
View
arch/arm/mach-tegra/Kconfig
View
arch/arm/mach-tegra/Makefile
View
arch/arm/mach-tegra/include/mach/lowlevel.h
View
arch/arm/mach-tegra/tegra20.c
View
arch/arm/mach-tegra/tegra_avp_init.c
View
arch/arm/mach-tegra/tegra_maincomplex_init.c
View
drivers/clk/tegra/Makefile
View
drivers/clk/tegra/clk-periph.c
View
drivers/clk/tegra/clk-tegra20.c
View
drivers/clk/tegra/clk-tegra30.c 0 → 100644
View
drivers/gpio/gpio-tegra.c
View
drivers/mci/tegra-sdmmc.c
View
drivers/pinctrl/Kconfig
View
drivers/pinctrl/Makefile
View
drivers/pinctrl/pinctrl-tegra30.c 0 → 100644
View
images/Makefile.tegra
View
include/dt-bindings/clock/tegra30-car.h 0 → 100644
View
include/dt-bindings/pinctrl/pinctrl-tegra.h 0 → 100644