commit | 206855c321adee56db3946ca09a5887cddb9d598 | [log] [tgz] |
---|---|---|
author | Ingo Molnar <mingo@elte.hu> | Sun Oct 12 11:32:17 2008 +0200 |
committer | Ingo Molnar <mingo@elte.hu> | Sun Oct 12 11:32:17 2008 +0200 |
tree | 13a2729d4d0e37170552bd9ad3c6bba71ba0c55c | |
parent | e8d3f455de4f42d4bab2f6f1aeb2cf3bd18eb508 [diff] | |
parent | cb58ffc3889f0545628f138f849e759a331b8ddc [diff] |
Merge branch 'x86/urgent' into core/signal Conflicts: arch/x86/kernel/signal_64.c