Mark Brown e4862f2f6f 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		2010-08-16 18:42:58 +01:00
..
asm	Merge branch 'for-2.6.36' into for-2.6.37	2010-08-16 18:42:58 +01:00