diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 12:59:32 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 12:59:37 +0200 |
commit | 7961386fe9596e6bf03d09948a73c5df9653325b (patch) | |
tree | 60fa2586a0d340ef8f7473956eef17430d8250c7 /arch/frv/include/asm/xor.h | |
parent | sched: emit thread info flags with stack trace (diff) | |
parent | Linux 2.6.30-rc5 (diff) | |
download | linux-7961386fe9596e6bf03d09948a73c5df9653325b.tar.xz linux-7961386fe9596e6bf03d09948a73c5df9653325b.zip |
Merge commit 'v2.6.30-rc5' into sched/core
Merge reason: sched/core was on .30-rc1 before, update to latest fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/frv/include/asm/xor.h')
-rw-r--r-- | arch/frv/include/asm/xor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/frv/include/asm/xor.h b/arch/frv/include/asm/xor.h new file mode 100644 index 000000000000..c82eb12a5b18 --- /dev/null +++ b/arch/frv/include/asm/xor.h @@ -0,0 +1 @@ +#include <asm-generic/xor.h> |