diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:18:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 07:36:22 -0400 |
| commit | 0ad5d703c6c0fcd385d956555460df95dff7eb7e (patch) | |
| tree | 4b777100f9be4fe90ca4bd043b9f98df672b5b3b /include/media | |
| parent | 44347d947f628060b92449702071bfe1d31dfb75 (diff) | |
| parent | 1cb81b143fa8f0e4629f10690862e2e52ca792ff (diff) | |
Merge branch 'tracing/hw-branch-tracing' into tracing/core
Merge reason: this topic is ready for upstream now. It passed
Oleg's review and Andrew had no further mm/*
objections/observations either.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions