]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8fe9793 31e7e93)
Merge branch 'v2.6.36-rc6-urgent-fixes' of git://xenbits.xen.org/people/sstabellini...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Oct 2010 16:51:28 +0000 (09:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Oct 2010 16:51:28 +0000 (09:51 -0700)
commit34984f54b7e8cb29632e921fb2f47b403c0e617a
tree76a900f41782ab78eb2c96ee2b6ff81c9f3bf1b3tree | snapshot (tar.bz2 tar.gz zip)
parent8fe9793af04e2a63257dd620984ca912a6a40965commit | diff
parent31e7e931cdc27f76dc68444edc4df1c0d1bfa6cccommit | 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
Clone of davem's net-next-2.6 tree