diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-03 00:25:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-03 00:25:38 -0500 |
| commit | dc573f9b20c8710105ac35c08ed0fe1da5160ecd (patch) | |
| tree | 24db0a0f6364b78f9c74e62541d26155e785b8f9 /sound/oss | |
| parent | b3a8c34886d0e3dd3a24a5b614ee025181da2f41 (diff) | |
| parent | ecf441b593ac41cb8cd8cd3695110167c42e098c (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core