| commit | 3e10e879a8c334a5927d800a3663a24d562cfa31 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sun Oct 19 19:04:47 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sun Oct 19 19:04:47 2008 +0200 |
| tree | 5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0 | |
| parent | 98d9c66ab07471006fd7910cb16453581c41a3e7 [diff] | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 [diff] |
Merge branch 'linus' into tracing-v28-for-linus-v3 Conflicts: init/main.c kernel/module.c scripts/bootgraph.pl