Merge branch 'misc-4.10' into for-chris-4.10-20170104
authorDavid Sterba <dsterba@suse.com>
Wed, 4 Jan 2017 10:42:16 +0000 (11:42 +0100)
committerDavid Sterba <dsterba@suse.com>
Wed, 4 Jan 2017 10:42:16 +0000 (11:42 +0100)

Trivial merge