Skip to content
Commit 4ea41e2d authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming 

Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
parents 8d75da8a 398007f8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment