Merge tag 'jfs-4.7' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2016 21:15:18 +0000 (14:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2016 21:15:18 +0000 (14:15 -0700)
commitdba1e987312ed318dfd46d4684e9e97b2223f2e8
treea993fee57793a70775276cfc5bc10442258bf735
parentcb6fd68fdd4a94880a99ad8515844c7a25e50d3e
parent6ed71e9819ac3412fc6a3495f5ce141df274c916
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
fs/jfs/namei.c
fs/jfs/super.c