From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Jul 2012 17:10:26 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: v3.6-rc1~58
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=76159c20c0bcf5b38178fbfb61049eeb6380bb54;p=linux.git

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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
---

76159c20c0bcf5b38178fbfb61049eeb6380bb54