From: Linus Torvalds 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-Tag: v2.6.18-rc2~94 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0486407bea3f0545ee3fcfb768b6763c5c2b459;p=linux-2.6 Merge commit master.kernel.org:/pub/scm/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 491e034f34,d4bc2939fd..5276d52c3f --- 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