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)
Core ftrace changes from Steve Rostedt, required by the arm64 support
code.


Trivial merge