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 'amba' into for-armsoc

2012-01-26 19:59:44 +00:00

core.h

ARM: amba: vexpress: get rid of private platform amba_device initializer

2012-01-25 11:04:03 +00:00

ct-ca9x4.c

Linux 3.3-rc2

2012-02-07 15:05:20 -08:00

hotplug.c

ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP

2012-01-23 10:20:05 +00:00

Kconfig

ARM: 7346/1: errata: fix PL310 erratum #753970 workaround selection

2012-02-27 11:22:38 +00:00

Makefile

ARM: realview/vexpress: consolidate SMP bringup code

2011-02-19 11:11:41 +00:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

platsmp.c

ARM: versatile: Add missing ENDPROC to headsmp.S

2012-01-16 08:35:25 -06:00

v2m.c

ARM: amba: vexpress: get rid of private platform amba_device initializer

2012-01-25 11:04:03 +00:00