android_kernel_xiaomi_sm8350/arch
Ingo Molnar 4369f1fb7c Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Conflicts:
	arch/x86/kernel/setup_percpu.c

Semantic conflict:

	arch/x86/kernel/cpu/common.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-01-27 12:03:24 +01:00
..
alpha Merge branch 'x86/mm' into core/percpu 2009-01-21 10:39:51 +01:00
arm Merge branch 'linus' into core/percpu 2009-01-27 12:01:51 +01:00
avr32 eeprom: More consistent symbol names 2009-01-26 21:19:57 +01:00
blackfin Merge branch 'linus' into core/percpu 2009-01-27 12:01:51 +01:00
cris Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 2009-01-14 19:58:40 -08:00
frv NOMMU: Make VMAs per MM as for MMU-mode linux 2009-01-08 12:04:47 +00:00
h8300 Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 2009-01-14 19:58:40 -08:00
ia64 Merge branch 'linus' into core/percpu 2009-01-27 12:01:51 +01:00
m32r eeprom: More consistent symbol names 2009-01-26 21:19:57 +01:00
m68k m68k{nommu}: fixups after the header move 2009-01-26 10:38:43 -08:00
m68knommu Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2009-01-26 10:33:01 -08:00
mips Merge branch 'linus' into core/percpu 2009-01-27 12:01:51 +01:00
mn10300 Merge branch 'x86/mm' into core/percpu 2009-01-21 10:39:51 +01:00
parisc Merge branch 'x86/mm' into core/percpu 2009-01-21 10:39:51 +01:00
powerpc Merge branch 'linus' into core/percpu 2009-01-27 12:01:51 +01:00
s390 [S390] Add missing compat system call wrappers. 2009-01-23 16:40:29 +01:00
sh Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 2009-01-26 15:11:41 -08:00
sparc Merge branch 'linus' into core/percpu 2009-01-27 12:01:51 +01:00
um
x86 Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu 2009-01-27 12:03:24 +01:00
xtensa byteorder: make swab.h include asm/swab.h like a regular header 2009-01-14 19:56:50 -08:00
.gitignore
Kconfig [CVE-2009-0029] System call wrapper infrastructure 2009-01-14 14:15:16 +01:00