Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
Linus Torvalds [Mon, 9 Jan 2012 20:50:15 +0000 (12:50 -0800)]
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix endian conversion issue in discard code


Trivial merge