Merge branches 'devel-cleanup', 'devel-omap4', 'devel-board' and 'devel-nand' into...