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-28 10:07:50 +08:00
2011-06-01 19:29:39 -07:00
2011-03-22 17:44:16 -07:00
2011-08-26 17:26:35 -07:00
2009-04-02 01:05:32 +00:00
2011-05-26 17:12:33 -07:00
2012-03-06 15:03:31 +08:00