From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Sep 2011 00:22:31 +0000 (-0700)
Subject: Merge branch 'upstream/bugfix' of git://github.com/jsgf/linux-xen
X-Git-Tag: v3.1~155
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9543314ee4b6b276af539cc9fc12c614816c74a;p=platform%2Fkernel%2Flinux-amlogic.git

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()
---

d9543314ee4b6b276af539cc9fc12c614816c74a