Merge git://git.infradead.org/~dwmw2/firmware-2.6