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
..
include/mach	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +00:00
clock.c	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +00:00
clock.h	ARM: LPC32XX: Clock driver	2010-07-27 03:08:09 -07:00
common.c	ARM: LPC32xx: ADC support for mach-lpc32xx	2012-02-22 14:19:16 +00:00
common.h	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +00:00
irq.c	ARM: LPC32xx: irq.c: Clear latched event	2012-02-27 17:28:02 +01:00
Kconfig	ARM: LPC32XX: Arch config menu supoport and makefiles	2010-07-27 08:46:22 -07:00
Makefile	ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem	2011-08-22 09:13:21 +01:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
phy3250.c	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +00:00
pm.c	ARM: LPC32xx: Fix missing and bad LPC32XX macros	2012-02-27 17:31:24 +01:00
serial.c	ARM: LPC32xx: serial.c: Fixed loop limit	2012-02-27 17:28:03 +01:00
suspend.S	ARM: LPC32XX: System suspend support	2010-07-27 08:35:56 -07:00
timer.c	ARM: LPC32xx: Fix missing and bad LPC32XX macros	2012-02-27 17:31:24 +01:00