summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-02 12:02:36 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-02 12:02:36 +0100
commit5512b3ece0cbb5024b83099963222700aa45f59e (patch)
tree24d60f354652f8b9ed5b0820aeb9da6add7be493 /kernel
parentc40c6f85a7594ad842233885386a0ca4cd40eafe (diff)
parent8325d9c09dedf45476f4d6261d1b6a72e4a7453f (diff)
parent54e991242850edc8c53f71fa5aa3ba7a93ce38f5 (diff)
parent778ef1e6cbb049c9bcbf405936ee6f2b6e451892 (diff)
downloadlinux-5512b3ece0cbb5024b83099963222700aa45f59e.tar.gz
linux-5512b3ece0cbb5024b83099963222700aa45f59e.tar.bz2
linux-5512b3ece0cbb5024b83099963222700aa45f59e.zip
Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core