Merge git://git.infradead.org/embedded-2.6