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/plat	Merge branch 'next/fixes' into next/cleanup	2011-10-31 23:25:41 +01:00
Kconfig	gpio: move Nomadik GPIO driver to drivers/gpio	2011-05-26 17:30:03 -06:00
Makefile	gpio: move Nomadik GPIO driver to drivers/gpio	2011-05-26 17:30:03 -06:00
timer.c	clocksource: convert ARM 32-bit down counting clocksources	2011-05-23 18:04:51 +01:00