From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 31 Aug 2006 00:12:11 +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-rc6~36
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9129d6ea475b7e9f216c8324ea05b7a0d8aba540;p=linux-2.6

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] Increase default nodes shift to 10, nr_cpus to 1024
  [IA64] remove redundant local_irq_save() calls from sn_sal.h
  [IA64] panic if topology_init kzalloc fails
  [IA64-SGI] Silent data corruption caused by XPC V2.
---

9129d6ea475b7e9f216c8324ea05b7a0d8aba540