From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 13 Jul 2006 04:19:23 +0000 (-0700)
Subject: Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 of HEAD
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a0486407bea3f0545ee3fcfb768b6763c5c2b459;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge commit /linux/kernel/git/gregkh/i2c-2.6 of HEAD

* HEAD:
  [PATCH] hwmon: Documentation update for abituguru
  [PATCH] hwmon: Fix for first generation Abit uGuru chips
  [PATCH] hwmon: New maintainer for w83791d
  [PATCH] pca9539: Honor the force parameter
  [PATCH] i2c-algo-bit: Wipe out dead code
  [PATCH] i2c: Handle i2c_add_adapter failure in i2c algorithm drivers
  [PATCH] i2c: New mailing list
  [PATCH] i2c-ite: Plan for removal
  [PATCH] i2c-powermac: Fix master_xfer return value
  [PATCH] scx200_acb: Fix the block transactions
  [PATCH] scx200_acb: Fix the state machine
  [PATCH] i2c-iop3xx: Avoid addressing self
  [PATCH] i2c: Fix 'ignore' module parameter handling in i2c-core
---

a0486407bea3f0545ee3fcfb768b6763c5c2b459
diff --cc MAINTAINERS
index 491e034f347,d4bc2939fd1..5276d52c3fc
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3180,8 -3180,15 +3180,14 @@@ S:	Maintaine
  W1 DALLAS'S 1-WIRE BUS
  P:	Evgeniy Polyakov
  M:	johnpol@2ka.mipt.ru
 -L:	lm-sensors@lm-sensors.org
  S:	Maintained
  
+ W83791D HARDWARE MONITORING DRIVER
+ P:	Charles Spirakis
+ M:	bezaur@gmail.com
+ L:	lm-sensors@lm-sensors.org
+ S:	Maintained
+ 
  W83L51xD SD/MMC CARD INTERFACE DRIVER
  P:	Pierre Ossman
  M:	drzeus-wbsd@drzeus.cx