Olof Johansson 0f9cb211ba
Merge tag 'v3.7-rc7' into next/cleanup ...
Merging in mainline back to next/cleanup since it has collected a few
conflicts between fixes going upstream and some of the cleanup patches.
Git doesn't auto-resolve some of them, and they're mostly noise so let's
take care of it locally.
Conflicts are in:
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/plat-omap/i2c.c
drivers/video/omap2/dss/dss.c
Signed-off-by: Olof Johansson <olof@lixom.net >
2012-11-25 21:34:34 -08:00
2012-11-03 09:52:54 +08:00
2012-11-05 11:36:06 -07:00
2012-11-22 09:14:54 -10:00
2012-11-23 20:55:06 +01:00
2012-10-15 14:45:51 -04:00
2012-11-23 14:32:55 +01:00
2012-11-25 21:34:34 -08:00
2012-11-07 09:35:53 -08:00
2012-11-15 17:06:24 +01:00
2012-11-25 21:34:34 -08:00
2012-10-31 21:02:57 +01:00
2012-10-08 22:52:54 -04:00
2012-11-21 00:17:40 -08:00
2012-11-15 17:06:24 +01:00
2012-10-30 10:05:51 +01:00
2012-10-23 16:32:18 +09:00
2012-11-13 22:45:42 -08:00
2012-10-19 14:07:47 -07:00
2012-11-25 21:34:34 -08:00
2012-11-22 13:21:57 +10:00
2012-11-16 07:58:20 -08:00
2012-10-24 15:46:27 -07:00
2012-11-05 21:54:40 +01:00
2012-11-25 21:34:34 -08:00
2012-10-19 19:44:06 +01:00
2012-10-23 09:03:49 -07:00
2012-11-22 21:45:34 -10:00
2012-11-25 21:34:34 -08:00
2012-11-06 07:37:10 -08:00
2012-11-07 18:59:26 -05:00
2012-11-11 12:09:43 -08:00
2012-10-07 21:04:56 +09:00
2012-11-23 12:11:13 -10:00
2012-11-15 17:06:24 +01:00
2012-10-25 12:21:48 -07:00
2012-10-10 20:15:24 +09:00
2012-11-15 17:06:24 +01:00
2012-11-25 21:34:34 -08:00
2012-11-23 14:17:36 -05:00
2012-11-20 00:09:26 +01:00
2012-10-17 15:53:03 -05:00
2012-10-09 16:22:18 +09:00
2012-10-09 16:11:46 +09:00
2012-11-05 16:59:59 -07:00
2012-10-24 13:25:44 -07:00
2012-11-15 11:58:24 +01:00
2012-10-09 01:47:35 -04:00
2012-10-13 11:27:59 +09:00
2012-10-10 20:15:24 +09:00
2012-11-16 14:33:04 -08:00
2012-11-15 11:16:02 +09:00
2012-10-07 21:04:56 +09:00
2012-10-07 21:04:56 +09:00
2012-11-06 07:51:06 -08:00
2012-11-16 14:10:15 -08:00
2012-11-13 22:45:42 -08:00
2012-10-15 14:08:48 +09:00
2012-10-28 11:13:54 -07:00
2012-11-25 21:34:34 -08:00
2012-11-01 00:38:45 -07:00
2012-11-03 09:52:55 +08:00
2012-11-25 21:34:34 -08:00
2012-10-09 16:22:19 +09:00
2012-11-25 21:34:34 -08:00
2012-10-10 09:10:32 -06:00
2012-10-24 23:19:30 -04:00
2012-11-25 21:34:34 -08:00
2012-11-09 14:54:24 +10:30
2012-11-15 17:08:51 +01:00
2012-11-20 18:52:01 -10:00
2012-10-16 18:07:12 -07:00
0f9cb211ba