From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 31 Jan 2011 08:23:41 +0000 (+0100)
Subject: Merge branch 'imx-board-ifdefs' into imx-for-2.6.39
X-Git-Tag: MMI-PSA29.97-13-9~20486^2~5^2~107
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf9f6c8fcd390a349be2e57f813c0b54fb0d0578;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'imx-board-ifdefs' into imx-for-2.6.39
---

bf9f6c8fcd390a349be2e57f813c0b54fb0d0578