From: Olof Johansson <olof@lixom.net>
Date: Wed, 25 Apr 2012 18:03:35 +0000 (-0700)
Subject: Merge tag 'arm-imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next... 
X-Git-Tag: firefly_0821_release~3680^2~2834^2~16
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3ff80abce7d0d3c1eacda53e73c94a57ade2e0a5;p=firefly-linux-kernel-4.4.55.git

Merge tag 'arm-imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup

ARM: i.MX: misc board cleanups

* tag 'arm-imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: i.MX: efikamx: match machine descriptions with legacy
  ARM: imx/mx21ads: remove unneeded cast
---

3ff80abce7d0d3c1eacda53e73c94a57ade2e0a5