Resolving merge
authorAlan Cox <alan@linux.intel.com>
Sun, 11 Mar 2018 17:26:39 +0000 (17:26 +0000)
committerAlan Cox <alan@linux.intel.com>
Sun, 11 Mar 2018 17:26:39 +0000 (17:26 +0000)

Trivial merge