Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[linux-2.6.git] / fs / xfs / linux-2.6 / xfs_discard.h
2011-01-12 Christoph Hellwig xfs: add FITRIM support