Merge tag 'jfs-4.1' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2015 23:04:26 +0000 (16:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2015 23:04:26 +0000 (16:04 -0700)
commit78d5dcda92a17f17132671c269ea2c3a17688649
tree8b3fa4f89eb2c488b080663d88d10de413239f39
parent2cfde72f0f26d3df7e565c5dce687c372042feba
parent7d2ac45611b072a24e5014a56a65e6be31c1f884
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