From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Aug 2008 18:46:39 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0016fe9d8a1ca99a4642735f41a7753d7c1f7e2b;p=linux-beck.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] Update generic config
  [IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU
  [IA64] Eliminate trailing backquote in IA64_SGI_UV
  [IA64] update generic_defconfig to support sn2.
  [IA64] update generic_defconfig for 2.6.27-rc1
  [IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096
  [IA64] Cleanup generated file not ignored by .gitignore
  [IA64] pv_ops: fix ivt.S paravirtualization
---

0016fe9d8a1ca99a4642735f41a7753d7c1f7e2b