| commit | 13d1ea9a20ed7d77f98c1622dcf9f3881649f6d7 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 23 Feb 2011 22:44:02 +0000 (23 14:44 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 23 Feb 2011 22:44:02 +0000 (23 14:44 -0800) | ||
| tree | 5f051aa8477aae53ca30536720f91bc55a55019c | treesnapshot (tar.gz zip) |
| parent | f19e0eec8b82faae4c2a5d129dfa9fe1cf66f5a9 | commitdiff |
| parent | be715140b5c3baf8ab6708060cfab80bef279d18 | commitdiff |
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
* '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