commit | 76159c20c0bcf5b38178fbfb61049eeb6380bb54 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 30 10:10:26 2012 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 30 10:10:26 2012 -0700 |
tree | 795ac1a54dbea55e91ce98c1b17a4a7ad455d4a0 | |
parent | 219c6734380e810adcf9d4c98c7ffed81ed44b4f [diff] | |
parent | e273bd98c9170c33456c948df878a1d696ede959 [diff] |
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