summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-13 04:50:44 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-13 04:50:44 +0100
commitf6411fe7e09b67470a2569231d6fa566c7c29b8b (patch)
treef12d569c70ff937175eb5cde2195fccfe2fa34eb /init
parentdf1c99d416500da8d26a4d78777467c53ee7689e (diff)
parentf24ade3a3332811a512ed3b6c6aa69486719b1d8 (diff)
parent9ead64974b05501bbac0d63a47c99fa786d064ba (diff)
Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core