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
2011-12-05 16:53:43 -08:00
2012-01-10 16:30:53 -08:00
2012-02-28 10:07:50 +08:00
2012-01-10 16:30:53 -08:00
2012-01-13 20:43:32 -08:00
2011-11-28 22:50:39 +08:00
2012-02-13 18:31:36 +01:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:52 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2011-12-13 12:26:24 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-13 20:43:32 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:52 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2011-11-22 10:58:31 +00:00
2011-11-22 10:58:32 +00:00
2012-01-10 16:30:53 -08:00
2012-01-10 10:29:42 +08:00
2012-03-05 15:49:43 -08:00
2012-01-10 16:30:53 -08:00
2012-02-07 08:03:42 +09:00
2012-03-06 15:03:31 +08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
2012-01-10 16:30:53 -08:00
f907ab06bb