Arnd Bergmann f907ab06bb
Merge branch 'next/fixes-non-critical' into next/drivers ...
Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de >
2012-03-20 22:42:24 +00:00
2012-02-08 15:07:03 -08:00
2012-02-13 18:31:37 +01:00
2012-02-19 18:57:51 -05:00
2012-02-18 15:37:25 -08:00
2012-02-06 14:37:52 -05:00
2012-03-05 15:49:43 -08:00
2012-02-15 13:09:26 +02:00
2012-02-08 20:03:14 +01:00
2012-02-22 16:48:51 +11:00
2012-03-03 09:31:49 -08:00
2012-03-10 22:30:21 -08:00
2012-02-02 14:00:43 +05:30
2012-02-21 16:47:28 -08:00
2012-01-30 21:33:34 +01:00
2012-03-05 16:58:11 +00:00
2012-03-08 09:39:54 +00:00
2012-03-05 10:28:58 +01:00
2012-03-07 09:48:44 -08:00
2012-03-08 09:33:44 -08:00
2012-02-13 18:31:37 +01:00
2012-02-10 14:18:46 -08:00
2012-03-07 08:31:31 -08:00
2012-03-08 11:36:06 +01:00
2012-02-09 15:41:29 -05:00
2012-02-08 19:03:51 -08:00
2012-02-16 16:15:12 +11:00
2012-03-08 17:21:51 -08:00
2012-02-24 12:32:51 -08:00
2012-03-20 22:42:24 +00:00
2012-03-05 15:49:43 -08:00
2012-03-20 22:42:24 +00:00
2012-02-04 07:17:47 -08:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-02-27 09:44:15 -06:00
2012-02-18 15:26:11 -08:00
2012-02-16 10:41:23 +08:00
2012-02-01 19:35:21 +01:00
2012-02-21 16:47:28 -08:00
2012-02-01 21:34:26 +04:00
2012-03-05 15:49:43 -08:00
2012-03-05 15:49:43 -08:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-03-02 17:33:00 +01:00
2012-03-05 15:49:43 -08:00
2012-02-13 11:57:58 -07:00
2012-02-01 15:26:00 -05:00
2012-02-08 16:19:06 -08:00
2012-02-07 06:48:58 +00:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-03-02 15:21:15 -08:00
2012-03-01 09:28:41 +10:30
2012-02-29 09:46:13 +01:00
2012-02-03 16:07:05 -05:00
f907ab06bb