Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit fdec29c5 authored by Alex Elder's avatar Alex Elder
Browse files

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

Conflicts:
	fs/xfs/linux-2.6/xfs_lrw.c
parents 0cb583fd 9ef96da6
Expand all 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