From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Nov 2010 18:54:49 +0000 (-0800)
Subject: Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v2.6.37-rc2~77
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=764e028e24d33f6e375d2a5df450c9d0180fbc00;p=linux.git

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6:
  Staging: ath6kl: remove empty files that mess with 'distclean'
  staging: ath6kl: Fixing the driver to use modified mmc_host structure
  Staging: solo6x10: fix build problem
---

764e028e24d33f6e375d2a5df450c9d0180fbc00