diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 14:53:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 14:53:01 +0200 |
| commit | dce561d0a498979e3d850a4eaaf6e8604b341aa3 (patch) | |
| tree | 4c5d82b5e0250db588d459e6e37b458d93d09f00 | |
| parent | 65b2b6eedb1fe0d72bdf5883ff43b69aeb42fa12 (diff) | |
| parent | b7a047f3bc596ac41a53b27b38eb7a7a5eb2d2b3 (diff) | |
| download | linux-crypto-dce561d0a498979e3d850a4eaaf6e8604b341aa3.tar.gz linux-crypto-dce561d0a498979e3d850a4eaaf6e8604b341aa3.zip | |
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>
0 files changed, 0 insertions, 0 deletions