git.maquefel.me Git - linux.git/commit

author	Arnd Bergmann <arnd@arndb.de>
	Tue, 9 Apr 2013 15:52:43 +0000 (17:52 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Tue, 9 Apr 2013 15:52:43 +0000 (17:52 +0200)
commit	f8da810cbb823c9781d703319ac4303568008fae
tree	03b33a2e85f0cfc2547749aa28acf4630f6989ac	tree \| snapshot
parent	03e86b3a27d4649fe0109617bae1fced54e150e0	commit \| diff
parent	964ea47572b89589b61b553e44bbe9907d4f12a6	commit \| diff

Merge branch 'tegra/clk' into next/dt2

This is a dependency for the tegra/dt branch.

Conflicts:
drivers/clocksource/tegra20_timer.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra20.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra30.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/tegra20_timer.c	diff1 \|	diff2 \|	blob \| history