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)
commitbf9f6c8fcd390a349be2e57f813c0b54fb0d0578
treeae98aa67ad534d9f01e0cdbc1d07c0ccefe57346
parent4404117d745f2251c5d3c739c50f617e755dbe12
parent53cdd3068b7b8e3a1a0e540ec42d9037296243b7
Merge branch 'imx-board-ifdefs' into imx-for-2.6.39