projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6fd41e f1c3962)
Merge branch 'upstream/bugfix' of git://github.com/jsgf/linux-xen
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Sep 2011 00:22:31 +0000 (17:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Sep 2011 00:22:31 +0000 (17:22 -0700)
* 'upstream/bugfix' of git://github.com/jsgf/linux-xen:
  xen: use non-tracing preempt in xen_clocksource_read()


Trivial merge
John Crispins staging tree