From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Apr 2015 23:04:26 +0000 (-0700)
Subject: Merge tag 'jfs-4.1' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: firefly_0821_release~176^2~1986
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=78d5dcda92a17f17132671c269ea2c3a17688649;p=firefly-linux-kernel-4.4.55.git

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

Pull jfs update from David Kleikamp:
 "Not much this time. Just a one-liner format fix"

* tag 'jfs-4.1' of git://github.com/kleikamp/linux-shaggy:
  jfs: %pf is only for function pointers
---

78d5dcda92a17f17132671c269ea2c3a17688649