Arnd Bergmann 3e965b1763 Merge branch 'next/fixes' into next/cleanup ...

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h
	drivers/video/omap/lcd_apollon.c
	drivers/video/omap/lcd_ldp.c
	drivers/video/omap/lcd_overo.c

2011-10-31 23:25:41 +01:00

..

include/mach

ARM: mach-prima2: remove mach/memory.h

2011-10-13 12:49:50 -04:00

clock.c

ARM: CSR: clock: Fix indentation

2011-10-01 09:40:44 +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: mach-prima2: remove mach/memory.h

2011-10-13 12:49:50 -04:00

lluart.c

…

Makefile

ARM: CSR: initializing L2 cache

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

Makefile.boot

…

prima2.c

Merge branch 'next/fixes' into next/cleanup

2011-10-31 23:25:41 +01:00

rstc.c

ARM: CSR: add missing sentinels to of_device_id tables

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

timer.c

ARM: CSR: timer: space required before the open parenthesis '('

2011-10-01 09:39:21 +08:00