From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 11 Oct 2011 01:51:49 +0000 (+1100)
Subject: Merge remote-tracking branch 'i.MX/for-next'
X-Git-Tag: next-20111011~104
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f66eacfdb43a9aa0671a10be3e17e593af4ca59a;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-mx5/mm.c
---

f66eacfdb43a9aa0671a10be3e17e593af4ca59a