| commit | a9de18eb761f7c1c860964b2e5addc1a35c7e861 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Dec 31 08:31:57 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Dec 31 08:31:57 2008 +0100 |
| tree | 886e75fdfd09690cd262ca69cb7f5d1d42b48602 | |
| parent | b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40 [diff] | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f [diff] |
Merge branch 'linus' into stackprotector Conflicts: arch/x86/include/asm/pda.h kernel/fork.c