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

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/char/i8k.c
index e210f858d3cbf854130e0c149703c0642710bf7e,776c50161432a9d027877631cdf6cd10bcd38e20..d915707d2ba1d3eae5b3ade411dd5226a5f3296d
--- 1/drivers/char/i8k.c
--- 2/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

diff --cc drivers/hwmon/nct6775.c
Simple merge

diff --cc drivers/hwmon/sis5595.c
Simple merge

diff --cc drivers/i2c/i2c-core.c
Simple merge

diff --cc drivers/i2c/muxes/i2c-mux-pca954x.c
Simple merge