From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jun 2011 18:14:22 +0000 (-0700)
Subject: Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v3.0-rc6~31
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d90ce8711ceb516de823ae878270e5a21d11dede;p=~emulex%2Finfiniband.git

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

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: comedi: fix build breakages on some platforms
  Staging: brcm80211: disable drivers except for X86 or MIPS platforms
  Staging: brcm80211: disable drivers for PPC platforms
  Staging: iio: Make IIO depend on GENERIC_HARDIRQS
  Staging: mei: fix suspend failure
  Staging: fix iio builds when IIO_RING_BUFFER is not enabled
  Staging: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE
  Staging: fix more iio builds when IIO_RING_BUFFER is not enabled
---

d90ce8711ceb516de823ae878270e5a21d11dede