From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Oct 2012 05:49:34 +0000 (+0300)
Subject: Merge tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v3.7-rc3~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d888af9654ee33b74e5eb7cdb27f223645d872e9;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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
---

d888af9654ee33b74e5eb7cdb27f223645d872e9