Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

author Zhang Rui <rui.zhang@intel.com>

Tue, 9 Dec 2014 03:37:35 +0000 (11:37 +0800)

committer Zhang Rui <rui.zhang@intel.com>

Tue, 9 Dec 2014 03:37:35 +0000 (11:37 +0800)
author Zhang Rui <rui.zhang@intel.com>
Tue, 9 Dec 2014 03:37:35 +0000 (11:37 +0800)
committer Zhang Rui <rui.zhang@intel.com>
Tue, 9 Dec 2014 03:37:35 +0000 (11:37 +0800)
diff --cc arch/arm/boot/dts/tegra124-jetson-tk1.dts
Simple merge
diff --cc arch/arm/boot/dts/tegra124.dtsi
Simple merge
author	Zhang Rui <rui.zhang@intel.com>
	Tue, 9 Dec 2014 03:37:35 +0000 (11:37 +0800)
committer	Zhang Rui <rui.zhang@intel.com>
	Tue, 9 Dec 2014 03:37:35 +0000 (11:37 +0800)
		1	2
arch/arm/boot/dts/tegra124-jetson-tk1.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/tegra124.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history