| commit | 3e965b176341b78620f7404fd8b7f9a0d061f8a2 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 23:25:41 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 23:25:41 2011 +0100 |
| tree | a2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 | |
| parent | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 [diff] | |
| parent | 5839fec9d8db35b2b07359b18a77295418e239ad [diff] |
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