]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'thermal/next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:30:40 +0000 (11:30 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:30:40 +0000 (11:30 +0200)
1  2 
drivers/acpi/thermal.c
drivers/thermal/Kconfig

Simple merge
Simple merge