tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'x86/core' into tracing/textedit

Browse Source 
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>
This commit is contained in:
Ingo Molnar
2009-03-06 16:44:14 +01:00
parent 1609743970 31bbed527e
commit f0ef039851
517 changed files with 19264 additions and 18627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/xtensa/include/asm/swab.h
+1 -1
View File
@@ -11,7 +11,7 @@
#ifndef _XTENSA_SWAB_H
#define _XTENSA_SWAB_H
#include <asm/types.h>
#include <linux/types.h>
#include <linux/compiler.h>
#define __SWAB_64_THRU_32__