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
..
asm	Merge branch 'next/fixes' into next/cleanup	2011-10-31 23:25:41 +01:00