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	Merge branch 'depends/rmk/memory_h' into next/fixes	2011-10-31 23:11:53 +01:00
clock.c	ARM: SAMSUNG: Move duplicate code for SPDIF ops	2011-07-21 02:10:04 +09:00
cpu.c	ARM: S5P: Moves initial map for merging S5P64X0	2010-10-18 10:33:34 +09:00
dev-audio.c	ASoC: Samsung: Rename AC97 platform device	2010-11-23 14:05:29 +00:00
dev-spi.c	Merge branch 'for-spi' into s5p-fixes-for-linus	2011-07-06 15:46:41 +09:00
dma.c	ARM: S5P: Reorder DMA platform device id	2010-10-25 16:10:47 +09:00
init.c	ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework	2010-05-20 15:28:32 +09:00
Kconfig	ARM: S5PC100: Add PWM backlight support on SMDKC100	2011-07-21 02:10:35 +09:00
mach-smdkc100.c	Merge branch 'depends/rmk/devel-stable' into next/cleanup	2011-10-08 21:07:42 +02:00
Makefile	gpio: Move the s5pc100 GPIO to drivers/gpio	2011-05-26 17:33:41 -06:00
Makefile.boot
setup-fb-24bpp.c	ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100	2011-07-21 02:11:30 +09:00
setup-i2c0.c	ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range()	2010-10-23 11:50:59 +09:00
setup-i2c1.c	ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range()	2010-10-23 11:50:59 +09:00
setup-ide.c	ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull()	2010-10-23 11:52:15 +09:00
setup-keypad.c	ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull()	2010-10-23 11:52:15 +09:00
setup-sdhci-gpio.c	ARM: S5PC100: Change to using s3c_gpio_cfgrange_nopull()	2010-10-23 11:51:41 +09:00
setup-sdhci.c	Fix common misspellings	2011-03-31 11:26:23 -03:00