From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Apr 2008 23:50: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.26-rc1~348
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=33ae0cdd3eaba219e7c2f0647b6db4be540e2130;p=linux-2.6-omap-h63xx.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] Provide ACPI fixup for /proc/cpuinfo/physical_id
  [IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO
  [IA64] allocate multiple contiguous pages via uncached allocator
  [IA64] bugfix: nptcg breaks cpu-hotadd
---

33ae0cdd3eaba219e7c2f0647b6db4be540e2130