tmp_suning_uos_patched/arch/arm/mach-realview
Linus Torvalds ac0f6f927d Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
  ARM: Eliminate decompressor -Dstatic= PIC hack
  ARM: 5958/1: ARM: U300: fix inverted clk round rate
  ARM: 5956/1: misplaced parentheses
  ARM: 5955/1: ep93xx: move timer defines into core.c and document
  ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
  ARM: 5953/1: ep93xx: fix broken build of clock.c
  ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
  ARM: 5949/1: NUC900 add gpio virtual memory map
  ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
  ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
  ARM: make_coherent(): fix problems with highpte, part 2
  MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
  ARM: 5945/1: ep93xx: include correct irq.h in core.c
  ARM: 5933/1: amba-pl011: support hardware flow control
  ARM: 5930/1: Add PKMAP area description to memory.txt.
  ARM: 5929/1: Add checks to detect overlap of memory regions.
  ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
  ARM: 5927/1: Make delimiters of DMA area globally visibly.
  ARM: 5926/1: Add "Virtual kernel memory..." printout.
  ARM: 5920/1: OMAP4: Enable L2 Cache
  ...

Fix up trivial conflict in arch/arm/mach-mx25/clock.c
2010-03-01 09:15:15 -08:00
..
include/mach Merge branch 'misc2' into devel 2010-02-25 22:09:41 +00:00
clock.c [ARM] realview: convert to clkdev and lookup clocks by device name 2008-11-27 12:38:21 +00:00
clock.h [ARM] realview: convert to clkdev and lookup clocks by device name 2008-11-27 12:38:21 +00:00
core.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
core.h RealView: Add default memory configuration 2009-11-05 10:10:36 +00:00
headsmp.S [ARM SMP] Add Realview MPcore SMP support 2005-11-07 21:05:42 +00:00
hotplug.c RealView: Use flush_cache_all() rather than MCR in cpu_enter_lowpower() 2008-12-01 14:54:56 +00:00
Kconfig ARM: RealView: Fix typo in the RealView/PBX Kconfig entry 2009-12-09 13:19:42 +00:00
localtimer.c [ARM] smp: allow re-use of realview localtimer TWD support 2009-05-17 19:16:41 +01:00
Makefile Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel 2009-06-11 15:35:00 +01:00
Makefile.boot RealView: Allow PHYS_OFFSET at 0x70000000 2008-12-01 14:54:55 +00:00
platsmp.c RealView: Remove duplicated #define REALVIEW_SYS_FLAGS* statements 2009-11-05 10:10:36 +00:00
realview_eb.c ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards 2010-01-11 15:39:21 +00:00
realview_pb11mp.c ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards 2010-01-11 15:39:21 +00:00
realview_pb1176.c ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards 2010-01-11 15:39:21 +00:00
realview_pba8.c ARM: 5873/1: ARM: Fix the reset logic for ARM RealView boards 2010-01-11 15:39:21 +00:00
realview_pbx.c ARM: 5907/1: ARM: Fix the reset on the RealView PBX Development board 2010-01-30 16:12:40 +00:00