diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-19 09:44:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-19 09:44:37 +0100 |
| commit | 3ac3ba0b396fd99550e08034b0e4c27fdf39c252 (patch) | |
| tree | f9f69fac41d66540a37a33808714d055d702328f /scripts/patch-kernel | |
| parent | sched: add hierarchical accounting to cpu accounting controller (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-3ac3ba0b396fd99550e08034b0e4c27fdf39c252.tar.gz linux-3ac3ba0b396fd99550e08034b0e4c27fdf39c252.zip | |
Merge branch 'linus' into sched/core
Conflicts:
kernel/Makefile
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions