]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* '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


Trivial merge
Clone of davem's net-next-2.6 tree