Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Sep 2013 17:07:47 +0000 (10:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Sep 2013 17:07:47 +0000 (10:07 -0700)
commit6cac446bd37d9381815fe4c2b0e7b1fd1085000c
treef08b1d7bd6a55eb97ec832162b91fbb3d94aaf47
parenta7301fcc123a82baa0b9451612fd512a8f073e5a
parent5f4513864304672e6ea9eac60583eeac32e679f2
Merge tag 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Fix potential crash condition in applesmc driver"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (applesmc) Check key count before proceeding