Merge branch 'for-chris-4.7' of...

Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux

 into for-linus-4.7

Signed-off-by: Chris Mason <clm@fb.com>