Merge branches 'tegra/board' and 'at91/board' into next/board