tree fb3b8ebfe11689ae46150b259ae292d2b49a0ab3
parent b17b849946e581ad58af74933d4fb63ad8812937
parent a20f0bc10c47fcf62be027e1a50b62791052ab56
author Linus Torvalds <torvalds@linux-foundation.org> 1296160459 +1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1296160459 +1000

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (lis3) turn down the no IRQ message
  hwmon: (asus_atk0110) Override interface detection on Sabertooth X58
  hwmon: (applesmc) Properly initialize lockdep attributes