Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
c862dd7067
linux/arch/arm/mach-kirkwood
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 ARM: mach-kirkwood: remove mach/memory.h 2011-09-26 10:12:00 -04:00
addr-map.c [ARM] Kirkwood: add support for PCIe1 2010-07-16 22:01:59 -04:00
common.c ARM: orion: Consolidate setup of the crypto engine. 2011-05-16 15:16:17 -04:00
common.h ARM: Remove dependency of plat-orion time code on mach directory includes. 2011-03-03 16:27:01 -05:00
cpuidle.c [ARM] Kirkwood: CPU idle driver 2009-06-08 13:04:41 -04:00
d2net_v2-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
db88f6281-bp-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
dockstar-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
guruplug-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
irq.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
Kconfig Kirkwood: Add support for 6282 based QNAP devices 2010-12-07 13:50:14 -05:00
lacie_v2-common.c [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
lacie_v2-common.h [ARM] Kirkwood: fix timer initialization for LaCie boards 2010-10-21 14:13:58 -04:00
Makefile [ARM] Kirkwood: remove duplicated code in LaCie setup files 2010-09-19 22:43:45 -04:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mpp.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
mpp.h ARM: orion: Refactor the MPP code common in the orion platform 2011-05-16 15:25:54 -04:00
mv88f6281gtw_ge-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
netspace_v2-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
netxbig_v2-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
openrd-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
pcie.c Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00
rd88f6192-nas-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
rd88f6281-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
sheevaplug-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
t5325-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
ts41x-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
ts219-setup.c ARM: mach-kirkwood: convert boot_params to atag_offset 2011-08-21 17:14:57 -04:00
tsx1x-common.c Fix common misspellings 2011-03-31 11:26:23 -03:00
tsx1x-common.h ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text 2010-07-26 10:33:08 +01:00