Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2011 04:08:27 +0000 (20:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2011 04:08:27 +0000 (20:08 -0800)
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (jz4740) Staticise jz4740_hwmon_driver
  hwmon: (jz4740) fix signedness bug


Trivial merge