Merge tag 'jfs-4.15-2' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Nov 2017 07:35:25 +0000 (21:35 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Nov 2017 07:35:25 +0000 (21:35 -1000)
commitbf8973fc76e456378d3e2d6a13ed62a52281d379
tree3ef8ed1c34f1059d286afd8f1a540a57593d4c50
parentc8a0739b185d11d6e2ca7ad9f5835841d1cfc765
parent86313903430d08739e391ad51b4865dc3a2bf522
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