From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 May 2016 21:15:18 +0000 (-0700)
Subject: Merge tag 'jfs-4.7' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v4.7-rc1~162
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dba1e987312ed318dfd46d4684e9e97b2223f2e8;p=users%2Fjedix%2Flinux-maple.git

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

Pull jfs updates from Dave Kleikamp:
 "Some jfs logging cleanups from Joe Perches"

* tag 'jfs-4.7' of git://github.com/kleikamp/linux-shaggy:
  jfs: Coalesce some formats
  jfs: Remove unnecessary line continuations and terminating newlines
  jfs: Remove terminating newlines from jfs_info, jfs_warn, jfs_err uses
---

dba1e987312ed318dfd46d4684e9e97b2223f2e8