diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-01 17:03:09 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-01 17:03:09 +0200 |
commit | d9244b5d2fbfe9fa540024b410047af13ceec90f (patch) | |
tree | d0fd7ce9146e89685d7fe2ee543450df83a0024f /arch/cris | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
parent | hwmon: Update documentation on fan_max (diff) | |
download | linux-d9244b5d2fbfe9fa540024b410047af13ceec90f.tar.xz linux-d9244b5d2fbfe9fa540024b410047af13ceec90f.zip |
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: Update documentation on fan_max
hwmon: (lm78) Add missing __devexit_p()
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions