From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Oct 2010 16:51:28 +0000 (-0700)
Subject: Merge branch 'v2.6.36-rc6-urgent-fixes' of git://xenbits.xen.org/people/sstabellini... 
X-Git-Tag: v2.6.36-rc7~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=34984f54b7e8cb29632e921fb2f47b403c0e617a;p=~shefty%2Frdma-dev.git

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

34984f54b7e8cb29632e921fb2f47b403c0e617a