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

Merge branch 'misc-4.6' into for-chris-4.6 

# Conflicts:
#	fs/btrfs/file.c
parents f004fae0 f7e98a7f
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