aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-27 14:30:57 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-27 14:30:57 +0100
commit4a66a82be78e1b6f9f83074423bf42a52251414c (patch)
tree027030444e79c5ae55feeb8410a5e73b17612d84 /kernel
parent32c0bd9624115041cfec31c0436995418083090a (diff)
parentcc2f6d90e950b69ad31d483c19cc1d121bb25c16 (diff)
parentba2607fe9c1f2d4ad5a3d4c4ae9117c5bfdca826 (diff)
Merge branches 'tracing/blktrace', 'tracing/kmemtrace' and 'tracing/urgent' into tracing/core