Arnd Bergmann b2f1df8d2f
Merge branch 'renesas/timer' into next/timer ...
Conflicts:
arch/arm/mach-shmobile/timer.c
This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.
Signed-off-by: Arnd Bergmann <arnd@arndb.de >
2012-03-20 09:41:43 +00:00
2012-01-14 12:32:16 -08:00
2011-06-15 21:52:50 -07:00
2012-01-18 01:14:17 -05:00
2011-11-26 19:21:26 -05:00
2011-09-27 18:08:04 +02:00
2011-11-04 12:01:48 -07:00
2011-11-16 09:21:49 +01:00
2011-09-27 18:08:04 +02:00
2012-01-12 20:13:06 -08:00
2011-11-08 10:23:29 +01:00
2011-12-12 14:14:31 -08:00
2011-10-31 20:21:22 +00:00
2012-03-20 09:41:43 +00:00
2012-02-01 17:28:26 -08:00
2012-01-24 10:47:42 -08:00
2011-12-11 09:00:48 -02:00
2011-10-26 16:32:13 -04:00
2011-12-19 20:07:13 +00:00
2012-01-14 12:26:41 -08:00
2011-09-27 18:08:04 +02:00
2012-03-07 09:48:44 -08:00
2011-11-23 11:33:07 +01:00
2011-06-07 16:06:01 +02:00
2012-02-24 00:46:45 -08:00
2011-11-04 15:52:51 -04:00
2011-06-13 13:43:05 +02:00
2011-07-25 23:06:24 -07:00
2011-11-17 13:35:20 -08:00
2011-12-27 11:27:13 +01:00
2011-11-04 12:01:47 -07:00
2011-11-04 12:01:48 -07:00
2011-08-03 14:25:21 -10:00
2012-01-11 23:58:43 -05:00
2011-12-26 20:09:35 -05:00
2011-09-27 18:08:04 +02:00
2012-01-19 23:22:49 +01:00
2011-05-13 16:31:00 -07:00
2011-05-23 13:01:00 -07:00
2011-11-02 16:07:02 -07:00
2011-12-11 10:32:23 -08:00
2011-12-27 11:27:12 +01:00
2011-08-14 12:03:58 +02:00
2012-01-16 12:34:12 +04:00
2011-11-16 12:39:48 +11:00
2012-01-04 16:26:32 -08:00
2012-01-12 09:59:18 +01:00
2011-09-27 18:08:04 +02:00
2012-02-06 16:29:19 -08:00
2011-12-14 11:38:25 +00:00
2012-01-23 03:15:25 -05:00
2011-09-27 18:08:04 +02:00
2012-01-10 16:30:41 -08:00
2012-01-04 16:04:30 -08:00
2011-07-14 17:57:09 -07:00
2012-01-16 09:37:53 -02:00
2012-01-28 08:10:23 +10:30
2012-01-12 20:13:04 -08:00
2012-01-06 15:26:14 +01:00
2011-08-16 08:04:08 -07:00
2011-09-26 16:18:41 -07:00
2011-08-13 18:34:03 -07:00
2011-12-11 10:31:58 -08:00
2011-09-27 18:08:04 +02:00
2011-05-25 08:39:21 -07:00
2011-07-11 16:48:38 -07:00
2012-01-14 22:25:56 +01:00
2011-11-04 12:01:47 -07:00
2012-01-13 10:12:23 -08:00
2011-11-09 12:10:37 +02:00
2011-07-26 16:49:45 -07:00
2011-11-02 16:07:02 -07:00
2012-01-13 10:27:33 +00:00
2011-11-18 12:16:24 +05:30
2011-12-27 11:27:12 +01:00
2011-08-13 18:34:03 -07:00
2012-01-20 15:08:38 +01:00
2011-12-12 14:14:31 -08:00
2011-09-21 19:45:34 +03:00
2011-05-25 08:39:45 -07:00
2011-09-27 18:08:04 +02:00
2012-03-05 15:49:42 -08:00
2011-12-02 16:12:42 +00:00
2011-12-11 10:31:23 -08:00
2011-05-28 17:03:29 +02:00
2011-06-13 13:43:05 +02:00
2011-06-13 13:43:05 +02:00
2011-12-23 10:17:51 +11:00
2011-09-27 18:08:04 +02:00
2011-09-27 18:08:04 +02:00
2011-11-07 07:54:42 +10:30
2012-01-26 14:11:31 +01:00
2011-06-15 21:52:50 -07:00
2011-08-13 18:34:03 -07:00
2011-07-24 10:03:05 -07:00
2011-09-27 18:08:04 +02:00
2011-07-11 12:45:04 -07:00
2012-01-24 10:50:22 -08:00
2011-07-25 20:57:17 -07:00
2011-08-13 18:34:03 -07:00
2011-08-13 18:34:02 -07:00
2012-01-02 13:04:55 +01:00
b2f1df8d2f
