Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 24 Jun 2013 18:01:09 +0000 (11:01 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 24 Jun 2013 18:01:09 +0000 (11:01 -0700)
commit5236eb968ec21c693d463d0494e39b00c1bc174d
tree1bb6abc27df94dad156225b7d2ec31d04fd9cdd7
parent33e5ff634f07dec26b7ed1fd7f9e32978fe1f2b2
parent2b4bc78956bdcc2bb4c49b3af955be776817e897
Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace

Fix from Steven Rostedt.