From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Sep 2011 20:35:43 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux
X-Git-Tag: next-20110927~109
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=ef82bdc57a204bf452da9f7c273c21462f17344e;p=karo-tx-linux.git

Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux

* 'hwmon-for-linus' of git://github.com/groeck/linux:
  hwmon: (coretemp) remove struct platform_data * parameter from create_core_data()
  hwmon: (coretemp) constify static data
  hwmon: (coretemp) don't use kernel assigned CPU number as platform device ID
  hwmon: (ds620) Fix handling of negative temperatures
  hwmon: (w83791d) rename prototype parameter from 'register' to 'reg'
  hwmon: (coretemp) Don't use threshold registers for tempX_max
  hwmon: (coretemp) Let the user force TjMax
  hwmon: (coretemp) Drop duplicate function get_pkg_tjmax
---

ef82bdc57a204bf452da9f7c273c21462f17344e