2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
linux-next/arch/parisc
Ingo Molnar f0ef039851 Merge branch 'x86/core' into tracing/textedit
Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-03-06 16:45:01 +01:00
..
configs [PARISC] move defconfig to arch/parisc/configs/ 2008-03-15 19:12:08 -07:00
hpux [PATCH] prepare vfs_readdir() callers to returning filldir result 2008-10-23 05:13:10 -04:00
include/asm Merge branch 'x86/core' into tracing/textedit 2009-03-06 16:45:01 +01:00
kernel Merge branch 'x86/urgent' into x86/apic 2009-02-05 22:30:01 +01:00
lib parisc: lib/: make code static 2009-01-05 18:15:24 +00:00
math-emu kbuild: fix up CFLAGS usage 2007-10-14 21:49:42 +02:00
mm parisc: fix kernel crash (protection id trap) when compiling ruby1.9 2009-01-05 19:16:46 +00:00
oprofile oprofile: more whitespace fixes 2008-10-15 20:55:51 +02:00
defpalo.conf Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
install.sh Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig cpumask: centralize cpu_online_map and cpu_possible_map 2008-12-13 21:19:41 +10:30
Kconfig.debug alpha/parisc: remove config variable DEBUG_RWLOCK 2008-02-06 10:41:03 -08:00
Makefile parisc: quiet palo not-found message from "which" 2009-01-05 19:10:34 +00:00
nm Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00