Merge branch 'next/headers' into next/drivers
authorJerome Brunet <jbrunet@baylibre.com>
Fri, 16 Jun 2017 18:32:36 +0000 (18:32 +0000)
committerJerome Brunet <jbrunet@baylibre.com>
Fri, 16 Jun 2017 18:32:36 +0000 (18:32 +0000)

Trivial merge