]> err.no Git - linux-2.6/commit
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 May 2006 22:16:14 +0000 (15:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 May 2006 22:16:14 +0000 (15:16 -0700)
commit4fbca5320eb102d2e15bdeffe79e125c11cf925e
tree59111c77d71bbdf557bbc30e31f5f3235ae0498c
parent509b70b677ca35a0e800807c6470181df5008d70
parent3170a5e80be7db29ab5ccb6b4145cf28b4a156de
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] arch/arm/kernel/dma-isa.c: named initializers
  [ARM] 3527/1: MPCore Boot Lockup Fix
  [ARM] arch/arm/kernel/process.c: Fix warning
  [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM
  [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes
  [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h