From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Feb 2011 22:44:02 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v2.6.38-rc7~50
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=13d1ea9a20ed7d77f98c1622dcf9f3881649f6d7;p=~emulex%2Finfiniband.git

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: check if device support discard in xfs_ioc_trim()
  xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1
---

13d1ea9a20ed7d77f98c1622dcf9f3881649f6d7