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: omap-for-v3.11/fixes-for-merge-window~48^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5236eb968ec21c693d463d0494e39b00c1bc174d;p=pandora-kernel.git

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

Fix from Steven Rostedt.
---

5236eb968ec21c693d463d0494e39b00c1bc174d
Reading git-diff-tree failed