summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2006-07-04Reenable keys to move tuxTobias Klauser1-8/+7
2006-07-03Initial importTobias Klauser5-0/+226
en' name='id' value='c90423d1de12fbeaf0c898e1db0e962de347302b'/>
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-11-06 07:50:37 +0100
committerIngo Molnar <mingo@kernel.org>2013-11-06 07:50:37 +0100
commitc90423d1de12fbeaf0c898e1db0e962de347302b (patch)
tree8c7a32b37e74155324ae2b556fcc42718ccf29a3 /include/trace/events/sched.h
parentecf1f014325ba60f4df35edae1a357c67c5d4eb1 (diff)
parentb8a216269ec0ce2e961d32e6d640d7010b8a818e (diff)
Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move
Conflicts: kernel/Makefile There are conflicts in kernel/Makefile due to file moving in the scheduler tree - resolve them. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/trace/events/sched.h')