| commit | 676412a37f248205ecadfaddb50e150a44ef2b0c | [log] [tgz] |
|---|---|---|
| author | Steven Rostedt <rostedt@rostedt.homelinux.com> | Fri May 30 21:34:52 2014 -0400 |
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | Fri May 30 21:34:52 2014 -0400 |
| tree | cab493e65ead15289510de753b27cccedba38b8c | |
| parent | c5da0837763644fe1bb5480bb3b5d70cb2e02ebb [diff] | |
| parent | 4c27e756bc019ec1c11232893af036fdae720a97 [diff] |
Merge branch 'trace/ftrace/core' into trace/for-next