Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>