commit 6232665040f9a23fafd9d94d4ae8d5a2dc850f65
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 31 11:48:53 2008 +1100
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 31 11:48:53 2008 +1100
tree 21ee1b178d0f96ad9f4932e4da8abccf2fbeae96
parent 94ed294c20ef07fffa40817c68155fba35dd67f1
parent c18d1250c7425dddd2633ce4eaf03d5015e68a0f

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  alpha: fix x86.git merge build error
  ia64: on UP percpu variables are not small memory model
  x86: fix arch/x86/kernel/test_nx.c modular build bug
  s390: use generic percpu linux-2.6.git
  POWERPC: use generic per cpu
  ia64: use generic percpu
  SPARC64: use generic percpu
  percpu: change Kconfig to HAVE_SETUP_PER_CPU_AREA
  modules: fold percpu_modcopy into module.c
  x86: export copy_from_user_ll_nocache[_nozero]
  x86: fix duplicated TIF on 64-bit