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
..
2010-08-14 22:26:51 +02:00
2010-08-14 22:26:51 +02:00
2010-08-16 18:42:58 +01:00
2010-08-12 10:01:30 -07:00
2010-08-12 08:43:30 -07:00
2010-08-14 22:26:51 +02:00
2010-08-14 22:26:51 +02:00
2010-08-14 22:26:51 +02:00
2010-08-14 22:26:51 +02:00
2010-08-14 22:26:51 +02:00
2010-08-14 22:26:51 +02:00
2010-08-12 06:38:24 +10:00
2010-08-14 11:54:09 -07:00
2010-08-14 22:26:51 +02:00
2010-08-12 08:43:30 -07:00
2010-08-12 08:43:30 -07:00
2010-08-12 08:43:30 -07:00
2010-08-13 16:53:13 -07:00
2010-08-12 04:14:10 +01:00
2010-08-12 04:14:05 +01:00
2010-08-13 12:03:24 -07:00
2010-08-13 17:52:35 -07:00
2010-08-12 14:23:04 -07:00
2010-08-12 14:23:04 -07:00
2010-08-11 18:21:02 +02:00
2010-08-11 18:21:02 +02:00
2010-08-12 11:47:50 +10:00
2010-08-12 11:27:58 +02:00
2010-08-14 22:26:51 +02:00
2010-08-12 09:51:35 -07:00
2010-08-12 04:14:05 +01:00
2010-08-12 10:15:10 -07:00
2010-08-12 10:15:10 -07:00
2010-08-13 16:53:13 -07:00
2010-08-13 16:53:13 -07:00
2010-08-12 11:47:26 +10:00
2010-08-12 09:09:41 -07:00
2010-08-12 08:43:29 -07:00