From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Jun 2012 18:56:45 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: v3.5-rc2~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3.5.0-rc1-00110-g71fae7e;p=karo-tx-linux.git

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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
---

71fae7e714749a52cb8be777ec014f82e8a747f4