Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Mar 2011 02:09:02 +0000 (18:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Mar 2011 02:09:02 +0000 (18:09 -0800)
commit3e1f2356ce231488dc1fa844e5ce91bcb59fc2a1
tree8a72df51c0ff3f7ac9e15b841e6a889c9202ba67
parente6eb5ce1b202ac9cdcfda5be559c9b9d8ec7542c
parenta7254d68b61c7873ce20591f0c56bf0245b72a76
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (adt7411) add MODULE_DEVICE_TABLE
  hwmon: (ad7414) add MODULE_DEVICE_TABLE