From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Apr 2008 19:50:00 +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~1056
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6e18933f2b6156d0a0ec9d5522ab6a6033cf7241;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:
  [PATCH] Build fix for CONFIG_NUMA=y && CONFIG_SMP=n
  [IA64] fix bootmem regression on Altix
---

6e18933f2b6156d0a0ec9d5522ab6a6033cf7241