From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 27 Sep 2011 01:27:50 +0000 (+1000)
Subject: Merge remote-tracking branch 'i.MX/for-next'
X-Git-Tag: next-20110927~99
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7ef88ee371370c228531ce1a8020f96dbf0c314e;p=karo-tx-linux.git

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

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

7ef88ee371370c228531ce1a8020f96dbf0c314e