]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
* '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()


Trivial merge