diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-22 18:08:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-22 18:08:56 -0400 |
commit | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (patch) | |
tree | 2c82f5d26bd9f2e2f82711ef58f3c7a1b6a9a4df /MAINTAINERS | |
parent | eaa8568901b3164197ce727c4c9b4067383e526c (diff) | |
parent | 4941b395b3c2635a8c16d88791a789fb6ac6be43 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (44 commits)
[PATCH] I2C: I2C controllers go into right place on sysfs
[PATCH] hwmon-vid: Add support for Intel Core and Conroe
[PATCH] lm70: New hardware monitoring driver
[PATCH] hwmon: Fix the Kconfig header
[PATCH] i2c-i801: Merge setup function
[PATCH] i2c-i801: Better pci subsystem integration
[PATCH] i2c-i801: Cleanups
[PATCH] i2c-i801: Remove PCI function check
[PATCH] i2c-i801: Remove force_addr parameter
[PATCH] i2c-i801: Fix block transaction poll loops
[PATCH] scx200_acb: Documentation update
[PATCH] scx200_acb: Mark scx200_acb_probe __init
[PATCH] scx200_acb: Use PCI I/O resource when appropriate
[PATCH] i2c: Mark block write buffers as const
[PATCH] i2c-ocores: Minor cleanups
[PATCH] abituguru: Fix fan detection
[PATCH] abituguru: Review fixes
[PATCH] abituguru: New hardware monitoring driver
[PATCH] w83792d: Add missing data access locks
[PATCH] w83792d: Fix setting the PWM value
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d10e629db563..f4cf0148c901 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -181,6 +181,12 @@ M: bcrl@kvack.org | |||
181 | L: linux-aio@kvack.org | 181 | L: linux-aio@kvack.org |
182 | S: Supported | 182 | S: Supported |
183 | 183 | ||
184 | ABIT UGURU HARDWARE MONITOR DRIVER | ||
185 | P: Hans de Goede | ||
186 | M: j.w.r.degoede@hhs.nl | ||
187 | L: lm-sensors@lm-sensors.org | ||
188 | S: Maintained | ||
189 | |||
184 | ACENIC DRIVER | 190 | ACENIC DRIVER |
185 | P: Jes Sorensen | 191 | P: Jes Sorensen |
186 | M: jes@trained-monkey.org | 192 | M: jes@trained-monkey.org |
@@ -2057,6 +2063,12 @@ M: adaplas@pol.net | |||
2057 | L: linux-fbdev-devel@lists.sourceforge.net | 2063 | L: linux-fbdev-devel@lists.sourceforge.net |
2058 | S: Maintained | 2064 | S: Maintained |
2059 | 2065 | ||
2066 | OPENCORES I2C BUS DRIVER | ||
2067 | P: Peter Korsgaard | ||
2068 | M: jacmet@sunsite.dk | ||
2069 | L: lm-sensors@lm-sensors.org | ||
2070 | S: Maintained | ||
2071 | |||
2060 | ORACLE CLUSTER FILESYSTEM 2 (OCFS2) | 2072 | ORACLE CLUSTER FILESYSTEM 2 (OCFS2) |
2061 | P: Mark Fasheh | 2073 | P: Mark Fasheh |
2062 | M: mark.fasheh@oracle.com | 2074 | M: mark.fasheh@oracle.com |
@@ -2528,12 +2540,6 @@ M: thomas@winischhofer.net | |||
2528 | W: http://www.winischhofer.at/linuxsisusbvga.shtml | 2540 | W: http://www.winischhofer.at/linuxsisusbvga.shtml |
2529 | S: Maintained | 2541 | S: Maintained |
2530 | 2542 | ||
2531 | SMSC47M1 HARDWARE MONITOR DRIVER | ||
2532 | P: Jean Delvare | ||
2533 | M: khali@linux-fr.org | ||
2534 | L: lm-sensors@lm-sensors.org | ||
2535 | S: Odd Fixes | ||
2536 | |||
2537 | SMB FILESYSTEM | 2543 | SMB FILESYSTEM |
2538 | P: Urban Widmark | 2544 | P: Urban Widmark |
2539 | M: urban@teststation.com | 2545 | M: urban@teststation.com |
@@ -3146,12 +3152,6 @@ L: wbsd-devel@list.drzeus.cx | |||
3146 | W: http://projects.drzeus.cx/wbsd | 3152 | W: http://projects.drzeus.cx/wbsd |
3147 | S: Maintained | 3153 | S: Maintained |
3148 | 3154 | ||
3149 | W83L785TS HARDWARE MONITOR DRIVER | ||
3150 | P: Jean Delvare | ||
3151 | M: khali@linux-fr.org | ||
3152 | L: lm-sensors@lm-sensors.org | ||
3153 | S: Odd Fixes | ||
3154 | |||
3155 | WATCHDOG DEVICE DRIVERS | 3155 | WATCHDOG DEVICE DRIVERS |
3156 | P: Wim Van Sebroeck | 3156 | P: Wim Van Sebroeck |
3157 | M: wim@iguana.be | 3157 | M: wim@iguana.be |