]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jun 2012 20:40:40 +0000 (13:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jun 2012 20:40:40 +0000 (13:40 -0700)
commit7b8377862bd816a5e8ceb5c713d88bf82555c8d4
treea22e9d373ec5d85343094320acbdcbe238b534da
parent7940b2adb474608318e51294d4e9fa0eee1bef61
parent2355375efdf10f43680d420023baa97796bfcdff
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "Two minor fixes in emc2103 and applesmc drivers."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (emc2103) Fix use of an uninitilized variable in error case
  hwmon: (applesmc) Limit key length in warning messages