q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/arch/arm/mach-s5p64x0
History
Linus Torvalds 1fdb24e969 Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
  ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
  ARM: gic, local timers: use the request_percpu_irq() interface
  ARM: gic: consolidate PPI handling
  ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
  ARM: mach-s5p64x0: remove mach/memory.h
  ARM: mach-s3c64xx: remove mach/memory.h
  ARM: plat-mxc: remove mach/memory.h
  ARM: mach-prima2: remove mach/memory.h
  ARM: mach-zynq: remove mach/memory.h
  ARM: mach-bcmring: remove mach/memory.h
  ARM: mach-davinci: remove mach/memory.h
  ARM: mach-pxa: remove mach/memory.h
  ARM: mach-ixp4xx: remove mach/memory.h
  ARM: mach-h720x: remove mach/memory.h
  ARM: mach-vt8500: remove mach/memory.h
  ARM: mach-s5pc100: remove mach/memory.h
  ARM: mach-tegra: remove mach/memory.h
  ARM: plat-tcc: remove mach/memory.h
  ARM: mach-mmp: remove mach/memory.h
  ARM: mach-cns3xxx: remove mach/memory.h
  ...

Fix up mostly pretty trivial conflicts in:
 - arch/arm/Kconfig
 - arch/arm/include/asm/localtimer.h
 - arch/arm/kernel/Makefile
 - arch/arm/mach-shmobile/board-ap4evb.c
 - arch/arm/mach-u300/core.c
 - arch/arm/mm/dma-mapping.c
 - arch/arm/mm/proc-v7.S
 - arch/arm/plat-omap/Kconfig
largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
 		2011-10-28 12:02:27 -07:00
..
include/mach Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
Kconfig ARM: S5P64X0: Add PWM backlight support on SMDK6450 2011-07-21 02:10:46 +09:00
Makefile ARM: S5P64X0: External Interrupt Support 2011-07-21 17:29:29 +09:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
clock-s5p6440.c ARM: S5P64X0: Add clkdev support 2011-07-20 19:11:30 +09:00
clock-s5p6450.c ARM: S5P64X0: Add clkdev support 2011-07-20 19:11:30 +09:00
clock.c ARM: S5P: Reduce duplicated EPLL control codes 2010-10-25 16:05:56 +09:00
cpu.c ARM: mach-s5p64x0: Setup consistent dma size at boot time 2011-08-22 12:00:10 +00:00
dev-audio.c ARM: S5P64X0: Segregate audio devices 2010-12-30 08:24:27 +09:00
dev-spi.c ARM: SAMSUNG: Add tx_st_done variable 2011-07-06 15:03:08 +09:00
dma.c ARM: S5P: Reorder DMA platform device id 2010-10-25 16:10:47 +09:00
gpiolib.c ARM: S5P64X0: Change GPIOlib initialization to core_initcall 2010-12-30 09:37:28 +09:00
init.c
…
irq-eint.c ARM: S5P64X0: Replace irq_gc_ack() with irq_gc_ack_set_bit() 2011-08-19 20:56:17 +09:00
mach-smdk6440.c ARM: mach-s5p64x0: convert boot_params to atag_offset 2011-08-21 17:15:10 -04:00
mach-smdk6450.c ARM: mach-s5p64x0: convert boot_params to atag_offset 2011-08-21 17:15:10 -04:00
setup-i2c0.c ARM: S5P64X0: Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:20 +09:00
setup-i2c1.c ARM: S5P64X0: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:53 +09:00