p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/arch/arm/mach-sa1100
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: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00:00
Makefile Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-27 08:39:10 +02:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
assabet.c 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
badge4.c ARM: mach-sa1100: convert boot_params to atag_offset 2011-08-21 17:15:13 -04:00
cerf.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
clock.c [ARM] sa1100: match clock by dev_name(dev) 2008-11-27 12:38:24 +00:00
collie.c ARM: 6658/1: collie: do actually pass locomo_info to locomo driver 2011-02-11 22:53:40 +00:00
cpu-sa1100.c Fix common misspellings 2011-03-31 11:26:23 -03:00
cpu-sa1110.c ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. 2010-12-21 14:53:39 +00:00
dma.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
generic.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
generic.h ARM: Remove DISCONTIGMEM support 2010-07-16 10:57:35 +01:00
h3xxx.c ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request 2009-12-06 16:52:58 +00:00
h3100.c ARM: mach-sa1100: convert boot_params to atag_offset 2011-08-21 17:15:13 -04:00
h3600.c ARM: mach-sa1100: convert boot_params to atag_offset 2011-08-21 17:15:13 -04:00
hackkit.c ARM: mach-sa1100: convert boot_params to atag_offset 2011-08-21 17:15:13 -04:00
irq.c ARM / SA1100: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
jornada720.c ARM: mach-sa1100: convert boot_params to atag_offset 2011-08-21 17:15:13 -04:00
jornada720_ssp.c Fix common misspellings 2011-03-31 11:26:23 -03:00
lart.c ARM: mach-sa1100: convert boot_params to atag_offset 2011-08-21 17:15:13 -04:00
leds-assabet.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-badge4.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-cerf.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-hackkit.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-lart.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds.c ARM: 7026/1: simpad: replace ARM specific LED code 2011-10-17 09:12:42 +01:00
leds.h ARM: 7026/1: simpad: replace ARM specific LED code 2011-10-17 09:12:42 +01:00
nanoengine.c ARM: mach-sa1100: convert boot_params to atag_offset 2011-08-21 17:15:13 -04:00
neponset.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
pci-nanoengine.c mach-sa1100: fix PCI build problem 2011-08-10 16:00:48 +00:00
pleb.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
pm.c ARM: pm: allow suspend finisher to return error codes 2011-07-02 09:54:01 +01:00
shannon.c ARM: mach-sa1100: convert boot_params to atag_offset 2011-08-21 17:15:13 -04:00
simpad.c 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
sleep.S ARM: pm: sa1100: move cpu_suspend into C code 2011-06-24 08:48:43 +01:00
ssp.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
time.c clocksource: convert ARM 32-bit up counting clocksources 2011-05-23 18:04:51 +01:00