| commit | 13d1ea9a20ed7d77f98c1622dcf9f3881649f6d7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 23 14:44:02 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 23 14:44:02 2011 -0800 |
| tree | 5f051aa8477aae53ca30536720f91bc55a55019c | |
| parent | f19e0eec8b82faae4c2a5d129dfa9fe1cf66f5a9 [diff] | |
| parent | be715140b5c3baf8ab6708060cfab80bef279d18 [diff] |
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