git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2f2239d)
x86: merge futex_32/64.h
authorThomas Gleixner <tglx@linutronix.de>
Wed, 30 Jan 2008 12:30:20 +0000 (13:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jan 2008 12:30:20 +0000 (13:30 +0100)
Finally merge them together.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/asm-x86/futex.h patch | blob | history
include/asm-x86/futex_32.h [deleted file] patch | blob | history
include/asm-x86/futex_64.h [deleted file] patch | blob | history

diff --cc include/asm-x86/futex.h
Simple merge
diff --cc include/asm-x86/futex_32.h
Simple merge
diff --cc include/asm-x86/futex_64.h
Simple merge
Pandora Kernel Repository