leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f408c985ce
linux/arch/arm/mach-footbridge
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
cats-hw.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
cats-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
common.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
common.h [ARM] footbridge: add isa_init_irq() to common header 2009-01-08 15:53:08 +00:00
dc21285-timer.c ARM: footbridge: fix clock event support 2011-06-11 00:46:17 +01:00
dc21285.c ARM: mach-footbridge: add missing header file <video/vga.h> 2011-08-25 09:08:19 -05:00
dma.c Merge branch 'dma' into devel 2009-02-21 21:42:50 +00:00
ebsa285-leds.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
ebsa285-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
ebsa285.c ARM: mach-footbridge: convert boot_params to atag_offset 2011-08-21 17:14:47 -04:00
isa-irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
isa-rtc.c ARM: footbridge: trim down old ISA rtc setup 2009-12-24 13:39:18 +00:00
isa-timer.c arm: Footbridge: Use common i8253 clockevent 2011-07-01 10:37:14 +02:00
isa.c ARM: footbridge: trim down old ISA rtc setup 2009-12-24 13:39:18 +00:00
Kconfig ARM: 7078/1: Footbridge: Sort KConfig Options alphabetically 2011-10-17 09:12:42 +01:00
Makefile ARM: footbridge: trim down old ISA rtc setup 2009-12-24 13:39:18 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
netwinder-hw.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
netwinder-leds.c locking, ARM: Annotate low level hw locks as raw 2011-09-13 11:12:14 +02:00
netwinder-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
personal-pci.c PCI: Make the struct pci_dev * argument of pci_fixup_irqs const. 2011-07-22 08:26:06 -07:00
personal.c ARM: mach-footbridge: convert boot_params to atag_offset 2011-08-21 17:14:47 -04:00