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
2012-03-05 16:58:11 +00:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-03-10 22:21:36 -08:00
2012-03-10 22:21:36 -08:00
2012-03-20 22:42:24 +00:00
2012-03-10 22:21:36 -08:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-02-07 15:05:20 -08:00
2012-03-20 22:42:24 +00:00
2012-03-10 22:21:36 -08:00
2012-03-20 22:42:24 +00:00
2012-03-10 22:21:36 -08:00
2012-03-05 16:58:11 +00:00
2012-03-10 22:21:36 -08:00
2012-02-28 12:21:17 +00:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-03-10 22:21:36 -08:00
2012-03-05 16:58:11 +00:00
2012-03-20 22:42:24 +00:00
2012-02-07 15:05:20 -08:00
2012-03-10 22:21:36 -08:00
2012-03-10 22:21:36 -08:00
2012-03-10 22:21:36 -08:00
2012-03-13 16:22:20 -07:00
2012-03-20 22:42:24 +00:00
2012-02-22 14:20:18 +00:00
2012-03-10 22:21:36 -08:00
2012-03-07 03:34:41 -08:00
2012-03-10 22:21:36 -08:00
2012-02-28 12:38:46 +00:00
2012-03-10 22:21:36 -08:00
2012-03-10 22:21:36 -08:00
2012-03-20 22:42:24 +00:00
2012-03-05 16:58:11 +00:00
2012-03-20 22:42:24 +00:00
2012-02-27 11:22:08 +00:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-02-09 16:16:35 -08:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-03-20 22:42:24 +00:00
2012-02-28 12:23:27 +00:00
2012-03-05 16:02:18 -08:00
f907ab06bb