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-08-15 15:17:39 -07:00
2012-08-10 12:01:32 -07:00
2012-08-10 12:01:33 -07:00
2012-08-10 12:01:33 -07:00
2012-09-21 09:37:53 -07:00
2012-10-19 10:54:30 -07:00
2012-09-05 16:52:08 -07:00
2012-08-10 12:01:33 -07:00
2012-09-18 17:20:48 +01:00
2012-09-18 17:20:48 +01:00
2012-08-10 12:01:33 -07:00
2012-11-13 10:52:52 -08:00
2012-07-16 16:54:25 -07:00
2012-08-10 12:01:33 -07:00
2012-08-10 12:01:34 -07:00
2012-10-15 10:03:14 +08:00
2012-07-09 13:35:05 -07:00
2012-10-24 14:26:55 -07:00
2012-10-19 15:40:18 -07:00
2012-07-16 16:53:16 -07:00
2012-08-15 15:17:40 -07:00
2012-07-09 13:35:05 -07:00
2012-08-10 12:04:09 -07:00
2012-07-09 13:35:05 -07:00
2012-09-10 16:01:37 -07:00
2012-10-01 19:11:38 -07:00
2012-07-16 16:56:47 -07:00
2012-08-27 07:15:30 -07:00
2012-08-10 12:04:09 -07:00
2012-07-09 13:35:05 -07:00
2012-11-05 11:36:04 -07:00
2012-07-18 16:40:29 -04:00
2012-09-21 09:37:53 -07:00
2012-10-17 13:42:29 -07:00
2012-07-09 13:35:05 -07:00
2012-08-10 12:04:10 -07:00
2012-07-16 17:13:39 -07:00
2012-07-16 16:56:48 -07:00
2012-06-26 19:42:11 -07:00
2012-06-26 19:42:11 -07:00
2012-06-26 19:42:11 -07:00
2012-09-05 16:55:18 -07:00
2012-06-26 19:42:11 -07:00
2012-06-26 19:42:11 -07:00
2012-09-21 09:43:55 -07:00
2012-06-12 13:31:03 +03:00
2012-09-14 11:17:21 +02:00
2012-08-10 11:49:13 -07:00
2012-10-01 18:19:05 -07:00
2012-09-27 09:16:38 -07:00
2012-09-14 11:16:54 +02:00
2012-09-19 17:42:18 +02:00
2012-10-02 09:54:49 -07:00
2012-06-13 17:26:11 -07:00
2012-10-01 18:19:05 -07:00
2012-10-24 14:26:55 -07:00
2012-10-17 11:36:37 -07:00
2012-08-15 15:17:40 -07:00
2012-10-01 19:11:38 -07:00
2012-09-19 17:42:18 +02:00
2012-07-18 16:40:29 -04:00
2012-11-13 10:52:52 -08:00
2012-06-13 12:38:36 -07:00
2012-10-25 11:43:44 -07:00
2012-09-05 12:26:11 -07:00
2012-09-10 12:59:42 -07:00
2012-07-30 17:25:12 -07:00
2012-09-13 21:48:48 -07:00
2012-08-16 14:00:37 -07:00
2012-10-17 13:42:29 -07:00
2012-10-25 13:13:48 -07:00
2012-10-22 13:26:48 -07:00
2012-09-13 15:49:28 -07:00
2012-09-25 15:19:34 -07:00
2012-09-05 12:07:19 -07:00
2012-10-25 13:13:47 -07:00
2012-10-25 13:13:48 -07:00
2012-09-25 15:19:34 -07:00
Olof Johansson
0f9cb211ba