| commit | 34984f54b7e8cb29632e921fb2f47b403c0e617a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 06 09:51:28 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 06 09:51:28 2010 -0700 |
| tree | 76a900f41782ab78eb2c96ee2b6ff81c9f3bf1b3 | |
| parent | 8fe9793af04e2a63257dd620984ca912a6a40965 [diff] | |
| parent | 31e7e931cdc27f76dc68444edc4df1c0d1bfa6cc [diff] |
Merge branch 'v2.6.36-rc6-urgent-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm * 'v2.6.36-rc6-urgent-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm: xen: do not initialize PV timers on HVM if !xen_have_vector_callback xen: do not set xenstored_ready before xenbus_probe on hvm