Files
linux/arch/mips/kernel
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
..
2008-05-01 08:03:58 -07:00
2011-12-07 22:03:45 +00:00
2011-12-07 22:03:45 +00:00
2011-12-07 22:03:45 +00:00
2011-12-07 22:03:45 +00:00
2011-12-07 22:03:45 +00:00
2011-12-07 22:03:45 +00:00
2011-03-31 11:26:23 -03:00
2011-12-07 22:03:45 +00:00
2010-10-04 18:33:54 +01:00
2009-07-12 12:22:34 -07:00
2011-12-07 22:03:45 +00:00
2011-09-21 17:52:38 +02:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:47 -07:00
2009-06-24 18:34:40 +01:00
2012-02-20 18:33:20 +01:00
2010-07-26 19:08:16 +01:00