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-03-20 22:42:24 +00:00
2011-10-31 23:25:41 +01:00
2012-02-29 16:32:37 +01:00
2011-03-28 08:54:23 +02:00
2012-01-20 13:32:10 +01:00
2011-03-14 14:05:16 +01:00
2012-02-29 16:32:38 +01:00
2011-06-22 13:26:49 +02:00
2012-02-29 16:32:38 +01:00
2012-02-29 16:32:38 +01:00
2011-08-22 09:12:53 +01:00
2012-01-13 20:43:32 -08:00
2012-01-20 13:12:48 +01:00
2012-02-29 16:32:34 +01:00
2012-02-29 16:32:34 +01:00
2012-01-09 14:38:51 -08:00
2012-01-09 14:38:51 -08:00
2011-11-03 09:40:51 -07:00
2012-01-25 11:02:02 +00:00
2011-05-26 10:33:35 +01:00
2011-05-26 10:33:35 +01:00
2012-02-29 16:32:36 +01:00
2011-05-26 10:33:35 +01:00
2010-12-08 13:14:06 +01:00
2011-03-14 14:05:12 +01:00
2012-01-16 08:36:03 -06:00
2012-01-23 10:20:05 +00:00
2011-12-19 00:35:05 +01:00
2012-03-15 15:51:06 +00:00
2011-02-23 17:54:27 +00:00
2012-02-29 18:31:18 +01:00
2011-10-17 09:12:40 +01:00
2011-04-10 17:01:04 +02:00
2011-03-29 14:47:58 +02:00
2010-09-19 12:12:26 +01:00
2011-08-30 09:23:11 +02:00
2012-01-23 10:20:05 +00:00
2010-09-19 12:12:27 +01:00
2010-10-04 19:46:07 +01:00
2011-10-03 09:34:16 +02:00
2012-01-20 13:12:38 +01:00
f907ab06bb