AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
511f1cb6d4
kernel_optimize_test/arch/arm/plat-s3c24xx
History
Arnd Bergmann f907ab06bb Merge branch 'next/fixes-non-critical' into next/drivers 
Conflicts:
	arch/arm/mach-lpc32xx/clock.c
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c

The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-20 22:42:24 +00:00
..
clock-dclk.c ARM: S3C24XX: Add clkdev support 2011-07-20 19:11:29 +09:00
clock.c fix typos concerning "initiali[zs]e" 2010-06-16 18:05:05 +02:00
common-smdk.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
cpu-freq-debugfs.c ARM: SAMSUNG: inclusion export.h instead of module.h 2011-11-17 01:14:38 +09:00
cpu-freq.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
cpu.c ARM: s3c24xx: move special idle code to out of line 2012-01-20 18:55:13 -05:00
dev-uart.c ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c 2011-10-06 11:14:30 +09:00
dma.c ARM: S3C24XX: DMA resume regression fix 2012-03-03 07:36:59 +09:00
irq-pm.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
irq.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
Kconfig ARM: SAMSUNG: Remove useless Samsung GPIO related CONFIGs 2011-09-21 15:07:05 +09:00
Makefile ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c 2011-10-06 11:14:30 +09:00
pm-simtec.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
pm.c ARM: S3C24XX: Remove s3c2410_gpio_getcfg(), implement s3c_gpio_getcfg() 2010-05-06 10:50:42 +09:00
s3c2410-clock.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
s3c2410-cpufreq-utils.c
s3c2410-iotiming.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
s3c2412-iotiming.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
s3c2443-clock.c ARM: S3C24XX: use static declaration when it is not used in other files 2012-01-21 12:02:30 +09:00
setup-i2c.c ARM: S3C24XX: Drop s3c2410 specific s3c2410_gpio_cfgpin() 2010-05-06 09:32:29 +09:00
setup-ts.c ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen 2010-05-19 18:25:22 +09:00
simtec-audio.c
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00
spi-bus0-gpe11_12_13.c ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull 2010-11-25 10:58:10 +09:00
spi-bus1-gpd8_9_10.c ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull 2010-11-25 10:58:10 +09:00
spi-bus1-gpg5_6_7.c ARM: S3C24XX: Fix wrong s3c_gpio_cfgpull 2010-11-25 10:58:10 +09:00