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)
Fix from Steven Rostedt.


Trivial merge