Merge tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Oct 2012 05:49:34 +0000 (08:49 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Oct 2012 05:49:34 +0000 (08:49 +0300)
commitd888af9654ee33b74e5eb7cdb27f223645d872e9
tree927f09532c93239697cf0ddeb49d3a550c323275
parente589db7a6a9c8f1557007f2cc765ee28ad7a1edd
parent4e7a4b01222343481d8ff084dbef9b80f7089a19
Merge tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy

Pull jfs fix from Dave Kleikamp:
 "Bug fix: Fix FITRIM argument handling"

* tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy:
  jfs: Fix FITRIM argument handling