diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:16:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 11:16:05 -0400 |
| commit | d1f53fb90ee631a2cf8f7bdd0e921a338106e4f9 (patch) | |
| tree | 94b0177d06d5c648808b0dec0241b33a51d3d27e /MAINTAINERS | |
| parent | 90c8fce53a48dd22cf09c67c861e3aaad17026ed (diff) | |
| parent | b930f964cfe65941c6b1ba61efedfe49da3f6353 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
MAINTAINERS: update IDE entry
palm_bk3710: palm_bk3710_udmatimings[] CodingStyle fixup
palm_bk3710: those registers/bitfields don't exist
mediabay: fix build for CONFIG_BLOCK=n
ide: Stop disks on reboot for laptop which cuts power
ide-cd: fix kernel crash on hppa regression
palm_bk3710: UDMA performance fix
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d58027ed1349..ef03abed595a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2758,7 +2758,7 @@ IDE SUBSYSTEM | |||
| 2758 | P: Bartlomiej Zolnierkiewicz | 2758 | P: Bartlomiej Zolnierkiewicz |
| 2759 | M: bzolnier@gmail.com | 2759 | M: bzolnier@gmail.com |
| 2760 | L: linux-ide@vger.kernel.org | 2760 | L: linux-ide@vger.kernel.org |
| 2761 | T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/ | 2761 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git |
| 2762 | S: Maintained | 2762 | S: Maintained |
| 2763 | F: Documentation/ide/ | 2763 | F: Documentation/ide/ |
| 2764 | F: drivers/ide/ | 2764 | F: drivers/ide/ |