From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 14 Jan 2010 09:58:10 +0000 (+0100)
Subject: Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e;p=linux-edison.git

Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
---

37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e