diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-12 17:22:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-12 17:22:31 -0700 |
| commit | d9543314ee4b6b276af539cc9fc12c614816c74a (patch) | |
| tree | abca53769b43d4e5df2e44cd14f4f6d7b26c2181 /net | |
| parent | b6fd41e29dea9c6753b1843a77e50433e6123bcb (diff) | |
| parent | f1c39625d63c9f8eba8f036429c10a9cb9e32920 (diff) | |
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()
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions