diff options
| author |   Alex Elder <aelder@sgi.com> | 2011-10-18 20:00:14 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-10-18 20:00:14 +0000 |
| commit | 2900b33999e2fc8a8edf0dddaafffec4da25ee10 (patch) | |
| tree | b6013dafbf461ee6a0ec4f0f554c02e26877b41a /fs/xfs/xfs_trace.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux (diff) | |
| download | linux-dev-2900b33999e2fc8a8edf0dddaafffec4da25ee10.tar.xz linux-dev-2900b33999e2fc8a8edf0dddaafffec4da25ee10.zip | |
xfs: put in missed fix for merge problem
I intended to do this as part of fixing part of the conflict with
the merge with Linus' tree, but evidently it didn't get included in
the commit.
Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/xfs_trace.h')
0 files changed, 0 insertions, 0 deletions