tree c3834740725d93cdb3d89221cb24cf68fa688784
parent 71d00feca2598c68186ca5b83247746d6a7fed7e
parent 3aff03739cb19938b25ac262be90faf58192e847
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1193771085 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193771085 -0700

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 incorrect return value from ia64_setup_msi_irq()
  [IA64] arch/ia64/sn/kernel/mca.c: undo lock when sn_oemdata can't be extended
  [IA64] update sn2 defconfig to 64kb pages
  [IA64] fix typo in per_cpu_offset
  [IA64] /proc/cpuinfo "physical id" field cleanups
  [IA64] vDSO vs --build-id
  [IA64] check-segrel.lds vs --build-id
  [IA64] vmcore_find_descriptor_size should be in __init
  [IA64] ia64/mm/init.c: fix section mismatches