tree 492a2a9f18f07517f38eedb1f208a8efd9e56a7f
parent 8bc5fb6abb670fa9079cd1994f016a39f99698fe
parent bcbd2b65868213c1426654304de3da330cde6b3a
author Linus Torvalds <torvalds@linux-foundation.org> 1218048399 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1218048399 -0700

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