kevin/linux
1
Fork 0
Code
b1d70c62ff
linux/arch/m68k
History
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
..
amiga m68k: Use DIV_ROUND_CLOSEST 2010-02-27 18:27:14 +01:00
apollo m68k: apollo core - Kill warn_unused_result warnings 2009-01-12 20:56:35 +01:00
atari m68k: atari - Rename "mfp" to "st_mfp" 2009-02-22 09:23:02 -08:00
bvme6000 m68k: Kill several external declarations in source files 2009-01-12 20:56:34 +01:00
configs mac68k: replace mac68k SCC code with platform device 2010-02-27 18:31:09 +01:00
fpsp040 m68k: fix trigraph ignored warning in setox.S 2008-12-28 20:00:05 +01:00
hp300 m68k: hp300 core - Kill warn_unused_result warnings 2009-01-12 20:56:36 +01:00
ifpsp060 tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
include/asm Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-03-01 09:15:15 -08:00
kernel m68k: Define sigcontext ABI of ColdFire 2010-02-27 18:44:10 +01:00
lib
mac mac68k: start CUDA early 2010-02-27 18:31:13 +01:00
math-emu locking, m68k/asm-offsets: Rename signal defines 2009-09-01 09:38:03 +02:00
mm m68k{,nommu}/h8300: Remove obsolete comment about map_chunk 2010-02-27 18:27:14 +01:00
mvme16x m68k: Kill several external declarations in source files 2009-01-12 20:56:34 +01:00
mvme147 m68k: mvme147 core - Kill warn_unused_result warnings 2009-01-12 20:56:37 +01:00
q40 m68k: Kill several external declarations in source files 2009-01-12 20:56:34 +01:00
sun3 m68k: rename global variable vmalloc_end to m68k_vmalloc_end 2009-12-09 17:43:19 +09:00
sun3x m68k: Kill several external declarations in source files 2009-01-12 20:56:34 +01:00
tools/amiga
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
Kconfig mac68k: replace mac68k SCC code with platform device 2010-02-27 18:31:09 +01:00
Kconfig.debug
Makefile m68k: Add install target 2009-03-26 21:15:26 +01:00