summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-10 13:58:28 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-10 13:58:28 +0100
commitae216dd239765afd592f65d94d8430244cf77ed1 (patch)
treea8e203cd9260be48d07e1484f87023d7d3dbae64 /drivers/thermal
parentf9915bfef3c64ea0b0b960dd1b999b584a7ef460 (diff)
parent34cd4998d38f9bd04f34b78a7cb0c7f1bee00bd9 (diff)
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'drivers/thermal')
0 files changed, 0 insertions, 0 deletions