2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 22:53:55 +08:00
linux-next/arch/arm/mach-gemini
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
board-rut1xx.c Gemini: Add support for Teltonika RUT100 2009-03-26 10:06:27 +02:00
common.h Gemini: gpiolib based GPIO support v2 2009-03-26 10:06:27 +02:00
devices.c ARM: Add Gemini architecture v3 2009-03-26 10:06:08 +02:00
gpio.c Gemini: wrong registers used to set reg_level in gpio_set_irq_type() 2010-02-18 21:54:11 +02:00
irq.c ARM: Add Gemini architecture v3 2009-03-26 10:06:08 +02:00
Kconfig Gemini: Add support for Teltonika RUT100 2009-03-26 10:06:27 +02:00
Makefile Gemini: Add support for Teltonika RUT100 2009-03-26 10:06:27 +02:00
Makefile.boot ARM: Add Gemini architecture v3 2009-03-26 10:06:08 +02:00
mm.c ARM: Add Gemini architecture v3 2009-03-26 10:06:08 +02:00
time.c ARM: Add Gemini architecture v3 2009-03-26 10:06:08 +02:00