| commit | b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Oct 15 13:46:29 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Oct 15 13:46:29 2008 +0200 |
| tree | 53ccb1c2c14751fe69cf93102e76e97021f6df07 | |
| parent | 4f962d4d65923d7b722192e729840cfb79af0a5a [diff] | |
| parent | 278429cff8809958d25415ba0ed32b59866ab1a8 [diff] |
Merge branch 'linus' into stackprotector Conflicts: arch/x86/kernel/Makefile include/asm-x86/pda.h