diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-19 03:42:40 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-19 03:42:40 -0500 |
| commit | 30cd324e9787ccc9a5ede59742d5409857550692 (patch) | |
| tree | e53027e0283119de0ef4c3a431b1d20cd43003fb /block | |
| parent | c71dd42db2c6f1637b92502a214587431c1a6ad2 (diff) | |
| parent | 6d102bc68f3dd2ae0e305b09170b1751aa67baeb (diff) | |
| parent | 3d9101e92529e1ff6014f95a69afc82f37b9b13a (diff) | |
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core
Conflicts:
include/linux/ftrace.h