From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jan 2014 02:56:27 +0000 (-0800)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=9076e0cae70c5d6ddb9a0284a20885b2b8814416

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

Pull hwmon updates from Jean Delvare:
 "This include it87 driver improvements, and a tree-wide change of my
  e-mail address"

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  Update Jean Delvare's e-mail address
  hwmon: (it87) Print proper names for the IT8771E and IT8772E
  hwmon: (it87) Add support for the ITE IT8603E
---

9076e0cae70c5d6ddb9a0284a20885b2b8814416
diff --cc drivers/char/i8k.c
index e210f858d3c,776c5016143..d915707d2ba
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@@ -4,8 -6,7 +4,8 @@@
   * Copyright (C) 2001  Massimo Dal Zotto <dz@debian.org>
   *
   * Hwmon integration:
-  * Copyright (C) 2011  Jean Delvare <khali@linux-fr.org>
+  * Copyright (C) 2011  Jean Delvare <jdelvare@suse.de>
 + * Copyright (C) 2013  Guenter Roeck <linux@roeck-us.net>
   *
   * This program is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License as published by the