From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 16 Sep 2011 01:47:52 +0000 (+1000)
Subject: Merge remote-tracking branch 'i.MX/for-next'
X-Git-Tag: next-20110916~96
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3c96ba6e2ab14c0a8ea7e057e3ae8fb9acfc46b4;p=karo-tx-linux.git

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
	arch/arm/mach-imx/Makefile
---

3c96ba6e2ab14c0a8ea7e057e3ae8fb9acfc46b4