Skip to content
Commit 7fd21be7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux 

* 'btrfs-3.0' of git://github.com/chrismason/linux:
  Btrfs: force a page fault if we have a shorty copy on a page boundary
parents 9b137769 b6316429
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