git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Arnd Bergmann <arnd@arndb.de>
	Tue, 9 Apr 2013 15:07:36 +0000 (17:07 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Tue, 9 Apr 2013 15:07:36 +0000 (17:07 +0200)
commit	731fa0cc74bdaffeffe95518beebf9f05172affa
tree	78da3848410f05949714b2e475d4cf92b463fb31	tree \| snapshot
parent	69fe435f2405a7f71ce87cd0b675a4145346c313	commit \| diff
parent	3c60918c6b5dee90a784d25fa74d12a78f22b819	commit \| diff

Merge branch 'tegra/soc' into next/drivers

This is a dependency for the tegra/clk branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/tegra20_timer.c

Linux Kernel Source Tree.

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
arch/arm/mach-tegra/board-harmony-pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/clk/tegra/clk-tegra20.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/tegra20_timer.c	diff1 \|	diff2 \|	blob \| history