tree 05445becce71e6dac507bcc15f55487bbf3e2f17
parent fd194e6493be47bd491931d19f563f59b54fd769
parent 0eae7799000cdf0c2ed596c39bfb71030809fc71
author Linus Torvalds <torvalds@linux-foundation.org> 1285380560 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1285380560 -0700

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:
  x86/hwmon: pkgtemp has no dependency on PCI
  MAINTAINERS: Update hwmon entry
  x86/hwmon: register alternate sibling upon CPU removal
  x86/hwmon: fix initialization of pkgtemp
  x86/hwmon: fix initialization of coretemp
  x86/hwmon: don't leak device attribute file from pkgtemp_probe() and pkgtemp_remove()
  x86/hwmon: avoid deadlock on CPU removal in pkgtemp
  x86/hwmon: fix module init for hotplug-but-no-device-found case
  hwmon: (lis3) Fix Oops with NULL platform data