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

..

clock-dclk.c

…

clock.c

…

common-smdk.c

driver-core: remove sysdev.h usage.

2011-12-21 16:26:03 -08:00

cpu-freq-debugfs.c

ARM: SAMSUNG: inclusion export.h instead of module.h

2011-11-17 01:14:38 +09:00

cpu-freq.c

driver-core: remove sysdev.h usage.

2011-12-21 16:26:03 -08:00

cpu.c

ARM: s3c24xx: move special idle code to out of line

2012-01-20 18:55:13 -05:00

dev-uart.c

…

dma.c

ARM: S3C24XX: DMA resume regression fix

2012-03-03 07:36:59 +09:00

irq-pm.c

…

irq.c

driver-core: remove sysdev.h usage.

2011-12-21 16:26:03 -08:00

Kconfig

…

Makefile

…

pm-simtec.c

driver-core: remove sysdev.h usage.

2011-12-21 16:26:03 -08:00

pm.c

…

s3c2410-clock.c

driver-core: remove sysdev.h usage.

2011-12-21 16:26:03 -08:00

s3c2410-cpufreq-utils.c

…

s3c2410-iotiming.c

…

s3c2412-iotiming.c

driver-core: remove sysdev.h usage.

2011-12-21 16:26:03 -08:00

s3c2443-clock.c

ARM: S3C24XX: use static declaration when it is not used in other files

2012-01-21 12:02:30 +09:00

setup-i2c.c

…

setup-ts.c

…

simtec-audio.c

…

sleep.S

…

spi-bus0-gpe11_12_13.c

…

spi-bus1-gpd8_9_10.c

…

spi-bus1-gpg5_6_7.c

…