| commit | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Dec 29 09:45:15 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Dec 29 09:45:15 2008 +0100 |
| tree | bca1fcfef55b3e3e82c9a822b4ac6428fce2b419 | |
| parent | 2b583d8bc8d7105b58d7481a4a0ceb718dac49c6 [diff] | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 [diff] |
Merge branch 'linus' into perfcounters/core Conflicts: fs/exec.c include/linux/init_task.h Simple context conflicts.