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

This commit is contained in:
Chris Mason 2017-04-27 14:13:09 -07:00
commit bce19f9d23
5 changed files with 277 additions and 66 deletions