diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-26 15:46:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-26 15:46:17 -0500 |
commit | 6fd8fb7f55cb6d45e7f078cd0eaf7e3c243f6c33 (patch) | |
tree | 3fa2bfd807c0f61acd875acf8f54ea2906022006 | |
parent | 6d4b9e38d3980826abccfbd90e95bf4bd41b8dd2 (diff) | |
parent | 2ca526bf4953380abfe5dff455e356967b239c70 (diff) |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
post 3.2-rc7 pull request
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
MAINTAINERS: firewire git URL update
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6afba60c3904..0e7a80aefa0c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2700,7 +2700,7 @@ FIREWIRE SUBSYSTEM | |||
2700 | M: Stefan Richter <stefanr@s5r6.in-berlin.de> | 2700 | M: Stefan Richter <stefanr@s5r6.in-berlin.de> |
2701 | L: linux1394-devel@lists.sourceforge.net | 2701 | L: linux1394-devel@lists.sourceforge.net |
2702 | W: http://ieee1394.wiki.kernel.org/ | 2702 | W: http://ieee1394.wiki.kernel.org/ |
2703 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git | 2703 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git |
2704 | S: Maintained | 2704 | S: Maintained |
2705 | F: drivers/firewire/ | 2705 | F: drivers/firewire/ |
2706 | F: include/linux/firewire*.h | 2706 | F: include/linux/firewire*.h |