Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jul 2011 16:02:58 +0000 (09:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jul 2011 16:02:58 +0000 (09:02 -0700)
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (max1111) Fix race condition causing NULL pointer exception
  hwmon: (it87) Fix label group removal
  hwmon: (asus_atk0110) Fix memory leak


Trivial merge