diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-31 01:48:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-31 01:48:53 +0100 |
| commit | 6232665040f9a23fafd9d94d4ae8d5a2dc850f65 (patch) | |
| tree | 21ee1b178d0f96ad9f4932e4da8abccf2fbeae96 /include/asm-ppc/8xx_immap.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| parent | alpha: fix x86.git merge build error (diff) | |
| download | linux-6232665040f9a23fafd9d94d4ae8d5a2dc850f65.tar.xz linux-6232665040f9a23fafd9d94d4ae8d5a2dc850f65.zip | |
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
Diffstat (limited to 'include/asm-ppc/8xx_immap.h')
0 files changed, 0 insertions, 0 deletions