diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:54:49 -0400 |
| commit | d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 (patch) | |
| tree | 2fac3ffbfffc7560eeef8364b541d0d7a0057920 /arch/um/include/asm/xor.h | |
| parent | c7e78cff6b7518212247fb20b1dc6411540dc9af (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts:
arch/um/include/asm/system.h
Diffstat (limited to 'arch/um/include/asm/xor.h')
| -rw-r--r-- | arch/um/include/asm/xor.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h new file mode 100644 index 000000000000..a19db3e17241 --- /dev/null +++ b/arch/um/include/asm/xor.h | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | #ifndef __UM_XOR_H | ||
| 2 | #define __UM_XOR_H | ||
| 3 | |||
| 4 | #include "asm-generic/xor.h" | ||
| 5 | |||
| 6 | #endif | ||