]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Mar 2010 18:14:46 +0000 (10:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Mar 2010 18:14:46 +0000 (10:14 -0800)
commitff7b4b5ae5a19ab4b6bc75538ad121b426377be0
tree5a1080b6f51a51fd515a61c518d46f7f2676c139
parent980c1b28be60872e8d5709be07fb1037e0ee45c0
parentc9b37f1e585b7256b348d23bd6968b774d58f085
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
arch/ia64/include/asm/acpi.h