Merge branch 'misc-4.7' into for-chris-4.7-20160525

This commit is contained in:
David Sterba 2016-05-25 22:51:02 +02:00
commit e73440868f
3 changed files with 9 additions and 4 deletions