Russell King bdf4e94823 Merge branch 'misc' into for-linus ...

Conflicts:
	arch/arm/mach-integrator/integrator_ap.c

2011-10-25 08:19:59 +01:00

..

include/mach

…

clock.c

ARM: CSR: add missing sentinels to of_device_id tables

2011-09-11 09:11:26 +08:00

common.h

…

irq.c

ARM: CSR: add missing sentinels to of_device_id tables

2011-09-11 09:11:26 +08:00

l2x0.c

ARM: CSR: initializing L2 cache

2011-07-09 07:21:53 +08:00

lluart.c

…

Makefile

ARM: CSR: initializing L2 cache

2011-07-09 07:21:53 +08:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

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

prima2.c

…

rstc.c

ARM: CSR: add missing sentinels to of_device_id tables

2011-09-11 09:11:26 +08:00

timer.c

ARM: CSR: add missing sentinels to of_device_id tables

2011-09-11 09:11:26 +08:00