Skip to content
Commit d9543314 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream/bugfix' of git://github.com/jsgf/linux-xen 

* 'upstream/bugfix' of git://github.com/jsgf/linux-xen:
  xen: use non-tracing preempt in xen_clocksource_read()
parents b6fd41e2 f1c39625
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment