From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Jan 2010 15:36:55 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
X-Git-Tag: v2.6.33-rc5~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4caca5f917ce991dc67fbb42fa82a1f044538e23;p=pandora-kernel.git

Merge git://git./linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: hv: fix smp problems in the hyperv core code
  Staging: et131x: Fix 2.6.33rc1 regression in et131x
  Staging: asus_oled: fix oops in 2.6.32.2
---

4caca5f917ce991dc67fbb42fa82a1f044538e23
Reading git-diff-tree failed