Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jan 2012 20:50:15 +0000 (12:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jan 2012 20:50:15 +0000 (12:50 -0800)
commit993ecff81aa6d50d694704de2647a5529ff2f166
tree047a313e86f63e22f1eff63945bea2e8e8147222
parent12e55508921865aefdd80fd17afe70c191afbd1b
parentb1c770c273a4787069306fc82aab245e9ac72e9d
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