Merge tag 'dt-3.11-6' of git://git.infradead.org/users/jcooper/linux into next/dt