summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-26 21:21:59 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-27 08:35:19 +0100
commit1b49061d400c9e51e3ac2aac026a099fe599b9bb (patch)
tree54c632cd7f0be2573897c1463a247e69fb769940 /mm
parent14131f2f98ac350ee9e73faed916d2238a8b6a0d (diff)
parent83ce400928680a6c8123d492684b27857f5a2d95 (diff)
downloadlinux-stable-1b49061d400c9e51e3ac2aac026a099fe599b9bb.tar.gz
linux-stable-1b49061d400c9e51e3ac2aac026a099fe599b9bb.tar.bz2
linux-stable-1b49061d400c9e51e3ac2aac026a099fe599b9bb.zip
Merge branch 'sched/clock' into tracing/ftrace
Conflicts: kernel/sched_clock.c
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions