Skip to content
Commit 680834ca authored by David Sterba's avatar David Sterba
Browse files

Merge branch 'foreign/jeffm/uapi' into for-chris-4.7-20160516 

# Conflicts:
#	include/uapi/linux/btrfs.h
parents 36fac9e9 14b05c51
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