Skip to content
Commit ff9cb1c4 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

Merge branch 'for_linus' into for_linus_merged 

Conflicts:
	fs/ext4/ioctl.c
parents e4e11180 d50f2ab6
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