From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Nov 2017 07:35:25 +0000 (-1000)
Subject: Merge tag 'jfs-4.15-2' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v4.15-rc1~35
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=bf8973fc76e456378d3e2d6a13ed62a52281d379;hp=c8a0739b185d11d6e2ca7ad9f5835841d1cfc765

Merge tag 'jfs-4.15-2' of git://github.com/kleikamp/linux-shaggy

Pull jfs fixlet from Dave Kleikamp:
 "Update jfs git tree in MAINTAINERS"

* tag 'jfs-4.15-2' of git://github.com/kleikamp/linux-shaggy:
  MAINTAINERS: fix jfs tree location
---

diff --git a/MAINTAINERS b/MAINTAINERS
index 290e13fa9b77..44512c346206 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7473,7 +7473,7 @@ JFS FILESYSTEM
 M:	Dave Kleikamp <shaggy@kernel.org>
 L:	jfs-discussion@lists.sourceforge.net
 W:	http://jfs.sourceforge.net/
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
+T:	git git://github.com/kleikamp/linux-shaggy.git
 S:	Maintained
 F:	Documentation/filesystems/jfs.txt
 F:	fs/jfs/