Merge tag 'imx-features-board-20120411-2' of git://git.pengutronix.de/git/imx/linux...