From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 13:24:28 +0000 (+0100)
Subject: Merge branch 'imx/devel' into imx/imx6q
X-Git-Tag: firefly_0821_release~3680^2~4232^2^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7e0cac630c7c90f12a78131df9913657fa30243b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'imx/devel' into imx/imx6q

Conflicts:
	arch/arm/plat-mxc/include/mach/memory.h
---

7e0cac630c7c90f12a78131df9913657fa30243b