From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Dec 2009 18:41:40 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
X-Git-Tag: Ubuntu-5.0.0-8.9~25110
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2127816366e0ffbc1426fa69e7b9b2bebd2e2288;p=mirror_ubuntu-disco-kernel.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: update TODO files
  Staging: hv: Fix some missing author names
  Staging: hv: Fix vmbus event handler bug
  Staging: hv: Fix argument order in incorrect memset invocations in hyperv driver.
---

2127816366e0ffbc1426fa69e7b9b2bebd2e2288