Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Nov 2011 18:56:01 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Nov 2011 18:56:01 +0000 (10:56 -0800)
commita767835f6dc85277e40fbfe69a29c18817d6c00b
treeaa22dc73ec92aaf34c9b0fb2c5dbeedad40d6312
parentd633180c20271d3b7c1fabbccbc7c5b30ad12be4
parent3627902377c4fbdeef4c689fb43b47a86a3ec859
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (exynos4_tmu) Fix Kconfig dependency

[ Merging code in-flight, just because I can.  What timezone should I
  use?  - Linus ]