aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-26 12:46:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-26 12:46:17 -0800
commit6fd8fb7f55cb6d45e7f078cd0eaf7e3c243f6c33 (patch)
tree3fa2bfd807c0f61acd875acf8f54ea2906022006
parent6d4b9e38d3980826abccfbd90e95bf4bd41b8dd2 (diff)
parent2ca526bf4953380abfe5dff455e356967b239c70 (diff)
downloadlinux-linaro-6fd8fb7f55cb6d45e7f078cd0eaf7e3c243f6c33.tar.gz
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--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6afba60c390..0e7a80aefa0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2700,7 +2700,7 @@ FIREWIRE SUBSYSTEM
M: Stefan Richter <stefanr@s5r6.in-berlin.de>
L: linux1394-devel@lists.sourceforge.net
W: http://ieee1394.wiki.kernel.org/
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
S: Maintained
F: drivers/firewire/
F: include/linux/firewire*.h