tree 43e9910434f91f4c94eed84d937661d4f303eba0
parent f560f6697f17e2465c8845c09f3a483faef38275
parent d3f684f2820a7f42acef68bea6622d9032127fb2
author Linus Torvalds <torvalds@linux-foundation.org> 1311004978 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311004978 -0700

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: (max1111) Fix race condition causing NULL pointer exception
  hwmon: (it87) Fix label group removal
  hwmon: (asus_atk0110) Fix memory leak