| commit | 5236eb968ec21c693d463d0494e39b00c1bc174d | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@linux.intel.com> | Mon Jun 24 11:01:09 2013 -0700 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Mon Jun 24 11:01:09 2013 -0700 |
| tree | 1bb6abc27df94dad156225b7d2ec31d04fd9cdd7 | |
| parent | 33e5ff634f07dec26b7ed1fd7f9e32978fe1f2b2 [diff] | |
| parent | 2b4bc78956bdcc2bb4c49b3af955be776817e897 [diff] |
Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace Fix from Steven Rostedt.