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

1 files changed, 8 insertions, 1 deletions

diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts
index 71347537b83e..15ca731bc24e 100644
--- a/arch/powerpc/boot/dts/tqm8540.dts
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -289,7 +289,14 @@
                 interrupt-map = <
                                 /* IDSEL 28 */
                                  0xe000 0 0 1 &mpic 2 1
-                                 0xe000 0 0 2 &mpic 3 1>;
+                                 0xe000 0 0 2 &mpic 3 1
+                                 0xe000 0 0 3 &mpic 6 1
+                                 0xe000 0 0 4 &mpic 5 1
+
+                                /* IDSEL 11 */
+                                 0x5800 0 0 1 &mpic 6 1
+                                 0x5800 0 0 2 &mpic 5 1
+                                 >;
 
                 interrupt-parent = <&mpic>;
                 interrupts = <24 2>;