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

Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Chris Mason 2016-01-11 08:39:28 -08:00
commit 988f1f576d
4 changed files with 58 additions and 18 deletions