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)
commit2f18e47c89f1a29cc815cd225b72dd7fd86acffe
tree9bb4bfc8a7acf15aa351d3b0574e727cd4e2497a
parent2f2239d1d53b06dd475634f79e1905f3775fcedc
x86: merge futex_32/64.h

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
include/asm-x86/futex_32.h [deleted file]
include/asm-x86/futex_64.h [deleted file]