]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/acpixf.h
Merge remote-tracking branch 'thermal/next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:34:10 +0000 (14:34 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:34:10 +0000 (14:34 +0200)
commitb6fc5aeb739458d56dad951ea59f21a73c9b0e14
tree9f87883a0c587235106bf4a4168dc0969a8b033b
parentb8f5e7ec624fe738b2eb9a44f3b999ba679bdde5
parent79122105c3949ce8606c098866f513574386f65b
Merge remote-tracking branch 'thermal/next'
drivers/acpi/thermal.c
drivers/thermal/Kconfig