Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jul 2012 17:10:26 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jul 2012 17:10:26 +0000 (10:10 -0700)
commit76159c20c0bcf5b38178fbfb61049eeb6380bb54
tree795ac1a54dbea55e91ce98c1b17a4a7ad455d4a0
parent219c6734380e810adcf9d4c98c7ffed81ed44b4f
parente273bd98c9170c33456c948df878a1d696ede959
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging

Pull a howmon update from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: struct x86_cpu_id arrays can be __initconst