Mali and UMP: Moving headers to a better place
ODROID-X/X2: small change on platform