diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 18:36:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 18:36:19 -0400 |
| commit | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (patch) | |
| tree | 569049e38e9b420a8c0e50a84d2579e176ca29de /MAINTAINERS | |
| parent | d6047d79b90f6122fcbf2c3e783b507f7dd78fc6 (diff) | |
| parent | eaf76e0d027a917a013ad8a88a94132d0feab622 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: sbp2: provide fallback if mgt_ORB_timeout is missing
ieee1394: add documentation entry to MAINTAINERS
ieee1394: update URLs in debugging-via-ohci1394.txt
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6b057778477d..d5eb8c13ef05 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2615,6 +2615,7 @@ L: linux1394-devel@lists.sourceforge.net | |||
| 2615 | W: http://www.linux1394.org/ | 2615 | W: http://www.linux1394.org/ |
| 2616 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git | 2616 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git |
| 2617 | S: Maintained | 2617 | S: Maintained |
| 2618 | F: Documentation/debugging-via-ohci1394.txt | ||
| 2618 | F: drivers/ieee1394/ | 2619 | F: drivers/ieee1394/ |
| 2619 | 2620 | ||
| 2620 | IEEE 1394 RAW I/O DRIVER | 2621 | IEEE 1394 RAW I/O DRIVER |