tree 39e1597430fb99407b491c888d6ac6d9fe7fa81c
parent 27c7651a6a5f143eccd66db38c7a3035e1f8bcfb
parent 94e44413cdda7b1b838a4c508a4eca0cdd5e7a18
author Linus Torvalds <torvalds@linux-foundation.org> 1378576459 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1378576459 -0700

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

Pull hwmon fixes from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (emc6w201) Do not declare enum variable
  hwmon: (w83792d) Update module author