Merge branch 'bb-3.8' into beaglebone

Conflicts:
	configs/beaglebone_defconfig

Signed-off-by: Anders Darander <anders@chargestorm.se>