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)
commitd9543314ee4b6b276af539cc9fc12c614816c74a
treeabca53769b43d4e5df2e44cd14f4f6d7b26c2181
parentb6fd41e29dea9c6753b1843a77e50433e6123bcb
parentf1c39625d63c9f8eba8f036429c10a9cb9e32920
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()