Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 20:44:22 +0000 (12:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Mar 2011 20:44:22 +0000 (12:44 -0800)
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: zero proper structure size for geometry calls


Trivial merge