| commit | 046fd53773cd87125f799b00422e487bf1428d38 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Sep 06 14:53:01 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Sep 06 14:53:01 2008 +0200 |
| tree | f379644e8ef8a1ce3ac09802794bd19c854265a6 | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 [diff] | |
| parent | 4ab4ba32aa16b012cb0faabf1a27952508fe67f2 [diff] | |
| parent | fe47784ba5cbb6b713c013e046859946789b45e4 [diff] | |
| parent | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b [diff] |
Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal Conflicts: arch/x86/kernel/signal_64.c Signed-off-by: Ingo Molnar <mingo@elte.hu>