Merge branch 'ftrace/arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorWill Deacon <will.deacon@arm.com>
Wed, 28 May 2014 17:29:23 +0000 (18:29 +0100)
committerWill Deacon <will.deacon@arm.com>
Wed, 28 May 2014 17:29:23 +0000 (18:29 +0100)
commit2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44
treede062b67715e1eb0321032ad2a87f12cb664643b
parentaf885f4022622331f17227dfcfbb2dafdee25a43
parenteed542d6962ba33a689b4007a389f466e407bd74
Merge branch 'ftrace/arm64' of git://git./linux/kernel/git/rostedt/linux-trace into for-next/core

Core ftrace changes from Steve Rostedt, required by the arm64 support
code.