From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Oct 2011 13:17:34 +0000 (+0200)
Subject: Merge branches 'imx/pata' and 'imx/sata' into next/driver
X-Git-Tag: v3.2-rc1~97^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a32750c2ca6f697903b19063fc86f4272865e3a1;p=pandora-kernel.git

Merge branches 'imx/pata' and 'imx/sata' into next/driver

Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h
---

a32750c2ca6f697903b19063fc86f4272865e3a1
Reading git-diff-tree failed