3.8: import fixes from panto and more drivers

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>