From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Aug 2010 01:29:18 +0000 (-0700)
Subject: Merge branch 'for-upstream/pvhvm' of git://xenbits.xensource.com/people/ianc/linux-2.6
X-Git-Tag: v2.6.36-rc3~44
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394;p=pandora-kernel.git

Merge branch 'for-upstream/pvhvm' of git://xenbits.xensource.com/people/ianc/linux-2.6

* 'for-upstream/pvhvm' of git://xenbits.xensource.com/people/ianc/linux-2.6:
  xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield
  xen: pvhvm: rename xen_emul_unplug=ignore to =unnnecessary
  xen: pvhvm: allow user to request no emulated device unplug
---

c05e1e23b8e5cf6c3a499e4aeb8503dcb3924394