core/linux-wandboard to 3.0.35-7, fix conflicts