Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Apr 2008 19:50:00 +0000 (12:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Apr 2008 19:50:00 +0000 (12:50 -0700)
commit6e18933f2b6156d0a0ec9d5522ab6a6033cf7241
treef8045942c4b5c250fd4eec8331fec8a7e2962974
parenteb855fd8e7f6b1d8b50f24aa36803e29b367b041
parent03970f065d9b4b156d0e879f82989440f7045396
Merge branch 'release' of git://git./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
kernel/sched.c