commit c31ca59e25f82879644088c97fe9cffbaa292786
author Linus Torvalds <torvalds@g5.osdl.org> Thu Aug 03 12:50:20 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu Aug 03 12:50:20 2006 -0700
tree eb1652fb3fe83d5aa2c943ec4e072ec6d775e424
parent fd60ae404f104f12369e654af9cf03b1f1047661
parent e44e41d0c832ebbda7311a1fe43584d844026357

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] fix show_mem for VIRTUAL_MEM_MAP+FLATMEM
  [IA64] align high endpoint of VIRTUAL_MEM_MAP
  [PATCH] Fix RAID5 + IA64 compile
  [IA64] Don't alloc empty frame in ia64_switch_mode_phys
  [IA64] Do not assume output registers be reservered.
  [IA64] add platform check to snsc driver init
  [IA64] sparse cleanups
  [IA64] Fix breakage in simscsi.c
  [IA64] Format /proc/pal/*/version_info correctly