Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jun 2012 18:56:45 +0000 (11:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jun 2012 18:56:45 +0000 (11:56 -0700)
commit71fae7e714749a52cb8be777ec014f82e8a747f4
treed5966817e2ad9f63fda68bbc92960e9ad19be0a9
parentff39d0e8f08f8b5a51352652a2d46c51bb7b6ecd
parentca4620853a5b578725edec1fc8f1345db3a823ab
Merge tag 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Update e-mail address in MAINTAINERS"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  MAINTAINERS: Update my e-mail address
MAINTAINERS