Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Jun 2009 15:03:09 +0000 (08:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Jun 2009 15:03:09 +0000 (08:03 -0700)
commitd9244b5d2fbfe9fa540024b410047af13ceec90f
treed0fd7ce9146e89685d7fe2ee543450df83a0024f
parent65039a31f4e44630f96f1b602c43cc8ad180d4fe
parentd54d462472a16fc07adb53a2fcd6c0c2a9a8dd1d
Merge branch 'hwmon-for-linus' of git://git./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()