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)
commit4c7fd114c65830cb052b6f3d0ab5b11626e64d5d
treebc6e04138c59caa5661f8ae5f9b833125ae4f26c
parentc640e13f8efeb38daa4c0b0891a46d32b01e51ac
parentaf24ee9ea8d532e16883251a6684dfa1be8eec29
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: zero proper structure size for geometry calls