korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 09:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
421b759b86
linux/arch/arm/mach-s3c2440
History
Arnd Bergmann 421b759b86 Merge branch 'samsung/cleanup' into next/boards 
Conflicts:
	arch/arm/mach-imx/mach-imx6q.c
	arch/arm/mach-omap2/board-ti8168evm.c
	arch/arm/mach-s3c64xx/Kconfig
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/common.c

Lots of relatively simple conflicts between the board
changes and stuff from the arm tree. This pulls in
the resolution from the samsung/cleanup tree, so we
don't get conflicting merges.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 17:06:36 +00:00
..
include/mach ARM: S3C2440: Fix usage gpio bank j pin definitions on GTA02 2011-03-04 15:46:26 +09:00
clock.c ARM: SAMSUNG: register uart clocks to clock lookup list 2011-12-23 10:06:58 +09:00
common.h ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
dma.c ARM: S3C24XX: Remove hw_addr from s3c24xx dma channel declarations 2011-09-16 15:39:43 +09:00
dsc.c ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h 2010-02-01 17:56:46 +00:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Kconfig ARM: SAMSUNG: Remove useless Samsung GPIO related CONFIGs 2011-09-21 15:07:05 +09:00
mach-anubis.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-at2440evb.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-gta02.c ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
mach-mini2440.c Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
mach-nexcoder.c ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
mach-osiris-dvs.c ARM: OSIRIS: DVS (Dynamic Voltage Scaling) supoort. 2009-12-01 01:33:49 +00:00
mach-osiris.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-rx1950.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-rx3715.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-smdk2440.c ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
Makefile ARM: S3C2440: Add HP iPAQ RX1950 machine support 2010-05-12 09:19:01 +09:00
s3c244x-clock.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
s3c244x-irq.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
s3c244x.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
s3c2440-cpufreq.c ARM: S3C2440: Fix s3c2440 cpufreq compilation post move. 2010-03-15 22:43:12 +00:00
s3c2440-pll-12000000.c ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support 2010-03-04 23:14:44 +00:00
s3c2440-pll-16934400.c ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support 2010-03-04 23:14:44 +00:00
s3c2440.c ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
s3c2442.c Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00