projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f19e0ee be71514)
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Feb 2011 22:44:02 +0000 (14:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Feb 2011 22:44:02 +0000 (14:44 -0800)
* '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


Trivial merge
John Crispins staging tree