diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 00:19:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 00:19:23 -0400 |
commit | a0486407bea3f0545ee3fcfb768b6763c5c2b459 (patch) | |
tree | df25e25f6c5c0c3d8db2c42835174cc081af71a5 /MAINTAINERS | |
parent | 2513eb8e67a2483aecb5bf7fead7692d5aabbdcd (diff) | |
parent | 5cab828bf0f52f3697a61aa99c54ee43844f53c0 (diff) |
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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 491e034f3475..5276d52c3fc5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -274,7 +274,7 @@ S: Maintained | |||
274 | ALI1563 I2C DRIVER | 274 | ALI1563 I2C DRIVER |
275 | P: Rudolf Marek | 275 | P: Rudolf Marek |
276 | M: r.marek@sh.cvut.cz | 276 | M: r.marek@sh.cvut.cz |
277 | L: lm-sensors@lm-sensors.org | 277 | L: i2c@lm-sensors.org |
278 | S: Maintained | 278 | S: Maintained |
279 | 279 | ||
280 | ALPHA PORT | 280 | ALPHA PORT |
@@ -1249,7 +1249,7 @@ S: Maintained | |||
1249 | I2C SUBSYSTEM | 1249 | I2C SUBSYSTEM |
1250 | P: Jean Delvare | 1250 | P: Jean Delvare |
1251 | M: khali@linux-fr.org | 1251 | M: khali@linux-fr.org |
1252 | L: lm-sensors@lm-sensors.org | 1252 | L: i2c@lm-sensors.org |
1253 | W: http://www.lm-sensors.nu/ | 1253 | W: http://www.lm-sensors.nu/ |
1254 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ | 1254 | T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ |
1255 | S: Maintained | 1255 | S: Maintained |
@@ -2093,7 +2093,7 @@ S: Maintained | |||
2093 | OPENCORES I2C BUS DRIVER | 2093 | OPENCORES I2C BUS DRIVER |
2094 | P: Peter Korsgaard | 2094 | P: Peter Korsgaard |
2095 | M: jacmet@sunsite.dk | 2095 | M: jacmet@sunsite.dk |
2096 | L: lm-sensors@lm-sensors.org | 2096 | L: i2c@lm-sensors.org |
2097 | S: Maintained | 2097 | S: Maintained |
2098 | 2098 | ||
2099 | ORACLE CLUSTER FILESYSTEM 2 (OCFS2) | 2099 | ORACLE CLUSTER FILESYSTEM 2 (OCFS2) |
@@ -3132,7 +3132,7 @@ S: Maintained | |||
3132 | VIAPRO SMBUS DRIVER | 3132 | VIAPRO SMBUS DRIVER |
3133 | P: Jean Delvare | 3133 | P: Jean Delvare |
3134 | M: khali@linux-fr.org | 3134 | M: khali@linux-fr.org |
3135 | L: lm-sensors@lm-sensors.org | 3135 | L: i2c@lm-sensors.org |
3136 | S: Maintained | 3136 | S: Maintained |
3137 | 3137 | ||
3138 | UCLINUX (AND M68KNOMMU) | 3138 | UCLINUX (AND M68KNOMMU) |
@@ -3182,6 +3182,12 @@ P: Evgeniy Polyakov | |||
3182 | M: johnpol@2ka.mipt.ru | 3182 | M: johnpol@2ka.mipt.ru |
3183 | S: Maintained | 3183 | S: Maintained |
3184 | 3184 | ||
3185 | W83791D HARDWARE MONITORING DRIVER | ||
3186 | P: Charles Spirakis | ||
3187 | M: bezaur@gmail.com | ||
3188 | L: lm-sensors@lm-sensors.org | ||
3189 | S: Maintained | ||
3190 | |||
3185 | W83L51xD SD/MMC CARD INTERFACE DRIVER | 3191 | W83L51xD SD/MMC CARD INTERFACE DRIVER |
3186 | P: Pierre Ossman | 3192 | P: Pierre Ossman |
3187 | M: drzeus-wbsd@drzeus.cx | 3193 | M: drzeus-wbsd@drzeus.cx |