diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 13:39:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 13:39:00 -0400 |
| commit | 4843a3baf20059a7ac5b55582672705d9e61e274 (patch) | |
| tree | 15a4a67b1c929493896d9cfca02ef079f6267e17 /MAINTAINERS | |
| parent | cb4cbcf6b3cf79f80c157afdc8dd8221643d8481 (diff) | |
| parent | e01698aed04811b9a9c4f8d54b73cb182757063d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide cmd64x: Remove serialize setting.
ide: Take over as maintainer.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 02f6f78b561f..5ef3a16eb140 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2824,10 +2824,10 @@ S: Supported | |||
| 2824 | F: drivers/scsi/ips.* | 2824 | F: drivers/scsi/ips.* |
| 2825 | 2825 | ||
| 2826 | IDE SUBSYSTEM | 2826 | IDE SUBSYSTEM |
| 2827 | P: Bartlomiej Zolnierkiewicz | 2827 | P: David S. Miller |
| 2828 | M: bzolnier@gmail.com | 2828 | M: davem@davemloft.net |
| 2829 | L: linux-ide@vger.kernel.org | 2829 | L: linux-ide@vger.kernel.org |
| 2830 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git | 2830 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git |
| 2831 | S: Maintained | 2831 | S: Maintained |
| 2832 | F: Documentation/ide/ | 2832 | F: Documentation/ide/ |
| 2833 | F: drivers/ide/ | 2833 | F: drivers/ide/ |