Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Tue, 9 Dec 2014 03:37:35 +0000 (11:37 +0800)
committerZhang Rui <rui.zhang@intel.com>
Tue, 9 Dec 2014 03:37:35 +0000 (11:37 +0800)
commit9c1e4550b5cbe17ff68ce631356190ef9a565386
tree04cd872bd8afd2b2fe143e2c17a180a39d1a275c
parent009d0431c3914de64666bec0d350e54fdd59df6a
parent184a4bf623fa587067851d25435fcb2f41de445b
Merge branch 'linus' of git://git./linux/kernel/git/evalenti/linux-soc-thermal into eduardo-soc-thermal
arch/arm/boot/dts/tegra124-jetson-tk1.dts
arch/arm/boot/dts/tegra124.dtsi