]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 May 2010 00:38:04 +0000 (17:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 May 2010 00:38:04 +0000 (17:38 -0700)
commitcea0d767c29669bf89f86e4aee46ef462d2ebae8
treee7f65605979547a2ecfd2ec26e9374cbe25ff1a7
parentb2464ab2023f20aea23ef8df1cb45b338c859ea5
parent0559a538899d48e7d730affb9df2abb13a7d9008
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: (applesmc) Correct sysfs fan error handling
  hwmon: (asc7621) Bug fixes