]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)
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


Trivial merge