From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 16 Aug 2010 17:42:58 +0000 (+0100)
Subject: Merge branch 'for-2.6.36' into for-2.6.37
X-Git-Tag: v2.6.37-rc1~126^2~1^2~159
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4862f2f6f5653dfb67f3ba2b6f0bc74516ed51a;p=pandora-kernel.git

Merge branch 'for-2.6.36' into for-2.6.37

Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
---

e4862f2f6f5653dfb67f3ba2b6f0bc74516ed51a
Reading git-diff-tree failed