From: H. Peter Anvin <hpa@linux.intel.com>
Date: Mon, 24 Jun 2013 18:01:09 +0000 (-0700)
Subject: Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace
X-Git-Tag: v3.11-rc1~130^2
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/5236eb968ec21c693d463d0494e39b00c1bc174d

Merge remote-tracking branch 'trace/tip/x86/trace' into x86/trace

Fix from Steven Rostedt.
---

5236eb968ec21c693d463d0494e39b00c1bc174d