From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 29 Sep 2011 08:40:29 +0000 (+0200)
Subject: Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq... 
X-Git-Tag: v3.2-rc1~39^2~3^3~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca4e419c20bd4dfc8f4e6af5a4ec3928b21e76a3;p=pandora-kernel.git

Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features

Conflicts:
	arch/arm/plat-mxc/avic.c
	arch/arm/plat-mxc/include/mach/common.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

ca4e419c20bd4dfc8f4e6af5a4ec3928b21e76a3
Reading git-diff-tree failed