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.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc21fe518a971bb2b0ab8370ec46ea21e84c57ab;p=pandora-kernel.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
Reading git-diff-tree failed