diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 08:53:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 08:53:20 -0400 |
| commit | f12e6a451aad671a724e61abce2b8b323f209355 (patch) | |
| tree | e4969282d07f7682099291e59545744b3bb5dcac /arch/blackfin/include/asm/futex.h | |
| parent | 046fd53773cd87125f799b00422e487bf1428d38 (diff) | |
| parent | dc44e65943169de2d1a1b494876f48a65a9737f1 (diff) | |
Merge branch 'x86/cleanups' into x86/signal
Conflicts:
arch/x86/kernel/signal_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/include/asm/futex.h')
0 files changed, 0 insertions, 0 deletions