From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Oct 2011 12:08:40 +0000 (-0700)
Subject: Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.2-rc1~141
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=cc21fe518a971bb2b0ab8370ec46ea21e84c57ab;p=cascardo%2Flinux.git

Merge branch 'x86-hyperv-for-linus' of git://git./linux/kernel/git/tip/tip

* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Hyper-V: Integrate the clocksource with Hyper-V detection code

Fix up conflicts in drivers/staging/hv/Makefile manually (some of the hv
code has moved out of staging to drivers/hv/)
---

cc21fe518a971bb2b0ab8370ec46ea21e84c57ab
diff --cc drivers/staging/hv/Makefile
index e071c12c8f69,14e3c6a14ea4..0f55ceee919b
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@@ -1,7 -1,14 +1,6 @@@
- obj-$(CONFIG_HYPERV)		+= hv_timesource.o
 -obj-$(CONFIG_HYPERV)		+= hv_vmbus.o
  obj-$(CONFIG_HYPERV_STORAGE)	+= hv_storvsc.o
 -obj-$(CONFIG_HYPERV_BLOCK)	+= hv_blkvsc.o
  obj-$(CONFIG_HYPERV_NET)	+= hv_netvsc.o
 -obj-$(CONFIG_HYPERV_UTILS)	+= hv_utils.o
  obj-$(CONFIG_HYPERV_MOUSE)	+= hv_mouse.o
  
 -hv_vmbus-y := vmbus_drv.o \
 -		 hv.o connection.o channel.o \
 -		 channel_mgmt.o ring_buffer.o
 -hv_storvsc-y := storvsc_drv.o storvsc.o
 -hv_blkvsc-y := blkvsc_drv.o  storvsc.o
 +hv_storvsc-y := storvsc_drv.o
  hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
 -hv_utils-y := hv_util.o hv_kvp.o