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
2009-12-04 15:39:49 +01:00
2009-11-23 09:41:55 +01:00
2009-01-21 15:12:40 +01:00
2008-07-14 09:01:02 +02:00
2009-09-21 15:44:51 +02:00
2010-04-04 12:21:39 +02:00
2009-09-21 15:44:39 +02:00
2007-10-16 16:51:18 +02:00
2007-10-16 16:51:18 +02:00
2008-01-31 17:29:13 +01:00
2008-01-31 17:29:13 +01:00
2010-05-31 09:10:03 +02:00
2008-08-01 13:13:13 +02:00
2009-02-05 15:08:48 +01:00
2009-02-05 15:08:51 +01:00
2009-11-06 14:32:06 +01:00
2010-01-14 09:18:48 +01:00
2007-10-16 16:51:18 +02:00
2009-12-22 09:00:14 +01:00
2007-10-16 16:51:18 +02:00
2008-01-31 17:29:21 +01:00
2009-11-18 07:23:16 +01:00
2007-10-16 16:51:18 +02:00
2007-10-16 16:51:18 +02:00
2009-03-26 18:14:24 +01:00
2010-05-10 09:49:30 +02:00
2008-01-31 17:29:13 +01:00
2007-10-16 15:58:10 +02:00
2009-01-31 00:13:56 +05:30
2007-10-16 15:58:10 +02:00
2009-02-05 09:17:50 +01:00
2010-04-13 11:57:14 +02:00
2007-10-16 16:51:18 +02:00
2010-03-17 18:10:46 +00:00
2010-08-14 22:26:51 +02:00
2008-11-17 11:45:39 +00:00
2009-07-08 14:20:20 +02:00
2008-08-01 13:37:15 +02:00
2007-10-16 16:51:18 +02:00
2008-04-29 19:01:56 +02:00
2008-02-22 14:20:08 -08:00
2010-01-07 15:47:38 +01:00
2007-10-16 16:51:18 +02:00
2010-08-07 17:07:31 -07:00
2009-04-15 10:54:06 +08:00
2009-11-10 16:32:38 +01:00
2008-11-17 11:45:53 +00:00
2009-12-21 12:09:22 +01:00
2008-07-10 09:32:58 +02:00
2007-10-16 16:51:18 +02:00
2007-10-16 16:51:18 +02:00
2009-03-11 09:55:03 +01:00
2009-11-04 09:17:40 +01:00
2010-08-12 14:00:00 +01:00
2008-08-06 15:39:47 +02:00
2010-08-12 14:00:00 +01:00
2010-08-12 14:00:00 +01:00
2010-08-12 14:00:00 +01:00
2009-03-30 12:43:02 -03:00
2007-10-16 16:51:18 +02:00
2010-08-12 14:00:00 +01:00
2010-07-29 10:21:11 +01:00
2009-06-17 10:56:53 +02:00
2010-05-07 16:42:23 +01:00
2008-01-31 17:29:13 +01:00
2010-06-25 12:29:01 +01:00
2009-06-15 21:54:48 +01:00
2010-04-16 13:12:36 +02:00
2008-08-13 11:46:40 +02:00
2010-02-12 10:31:06 +00:00
2010-03-16 15:57:43 +00:00
2010-03-16 16:03:30 +00:00
2009-12-18 13:06:47 +00:00
2010-03-03 17:08:43 +00:00
2010-08-05 13:38:57 +01:00
2009-12-04 15:39:55 +01:00
2009-05-22 15:11:22 +01:00
2010-04-30 16:12:44 +01:00
2009-11-05 18:10:25 +01:00
2009-08-10 13:14:46 +02:00
e4862f2f6f