Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Dec 2011 20:46:17 +0000 (12:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Dec 2011 20:46:17 +0000 (12:46 -0800)
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

MAINTAINERS

index 6afba60c390488acdfe818b98c823f0921a19749..0e7a80aefa0c27d52e9dec4e2a29d181ff7575ac 100644 (file)
@@ -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