tree 5a1080b6f51a51fd515a61c518d46f7f2676c139
parent 8098a7ef8946169cf8ffeb6f4d8130fc3651192e
parent 4d86e1b18d6de8446aa424b615b34e436d42c241
author Linus Torvalds <torvalds@linux-foundation.org> 1267467286 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1267467286 -0800

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] wrong attribute of HUB chip written in uv_setup()
  [IA64] remove trailing space in messages
  [IA64] use asm-generic/scatterlist.h
  [IA64] build arch/ia64/kernel/acpi-ext.o when CONFIG_ACPI
  [IA64] Only build arch/ia64/kernel/acpi.o when CONFIG_ACPI
  [IA64] Remove COMPAT_IA32 support