Merge branch 'tracing/fastboot' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Thu, 6 Nov 2008 06:43:47 +0000 (07:43 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 6 Nov 2008 06:43:47 +0000 (07:43 +0100)
commit79c81d220c8e25163f56edcdfaf23f83a4c88e6b
tree8748e39e968aacebbf150b81cbc845582b382a47
parent3299b4dd1180762da831be5eb6adc44553eaec26
parent79a9d461fd521f133f0e66485aa9ed09c21f5191
Merge branch 'tracing/fastboot' into tracing/ftrace
kernel/trace/trace.c
kernel/trace/trace.h