From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 28 Jun 2006 22:00:49 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.18-rc1~428
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=873d8898b7f6aeb4f2085381dbc201d68a37d02b;p=~emulex%2Finfiniband.git

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-SGI] fix prom revision checks in SN kernel
  [IA64] tiger_defconfig s/NR_CPUS=4/NR_CPUS=16/
  [IA64-SGI] - Pass OS logical cpu number to the SN prom (bios)
  [IA64] palinfo.c: s/register_cpu_notifier/register_hotcpu_notifier/
---

873d8898b7f6aeb4f2085381dbc201d68a37d02b