Merge tag 'dt-3.10-4' of git://git.infradead.org/users/jcooper/linux into next/dt2