Merge branch 'imx-board-ifdefs' into imx-for-2.6.39
authorSascha Hauer <s.hauer@pengutronix.de>
Mon, 31 Jan 2011 08:23:41 +0000 (09:23 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 31 Jan 2011 08:23:41 +0000 (09:23 +0100)

Trivial merge