Skip to content
Commit 22d5755a authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware)
Browse files

Merge branch 'trace/ftrace/urgent' into HEAD 

Needed to merge trace/ftrace/urgent to get:

  Commit 59300b36 ("ftrace: Check if pages were allocated before calling free_pages()")

To clean up the code that is affected by it as well.
parents 70193038 9deb193a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment