From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Jan 2012 20:50:15 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: firefly_0821_release~3680^2~3803
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=993ecff81aa6d50d694704de2647a5529ff2f166;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix endian conversion issue in discard code
---

993ecff81aa6d50d694704de2647a5529ff2f166