diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-29 14:58:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-29 14:58:34 -0700 |
commit | 592311c91daece7d6503bdef8fcc434f829aad23 (patch) | |
tree | 90683b80c0fed0aec1960af80c9a16cbf4d4d911 /arch/sparc/kernel/fpu_traps.S | |
parent | 9748d4d2b482e66d7024b4518ee0788521761801 (diff) | |
parent | bc4d45f1901042a295b10949f51d24cce223e65d (diff) |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (lm85) Fix error paths in probe function
hwmon: (lm85) Add missing list terminators
hwmon: (adm1021) Clarify documentation regarding Xeon processors
hwmon: (lm90) Fix update interval information in driver documentation
hwmon: (lm90) Add support for ADT7461A and NCT1008
Diffstat (limited to 'arch/sparc/kernel/fpu_traps.S')
0 files changed, 0 insertions, 0 deletions