From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Nov 2011 04:37:34 +0000 (-0800)
Subject: Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v3.2-rc3~16
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bbbc4791cd48ac12996e43c0033b504c79b53639;p=~emulex%2Finfiniband.git

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

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: fix more ET131X build errors
  staging: et131x depends on NET
  staging: slicoss depends on NET
  linux-next: et131x: Fix build error when CONFIG_PM_SLEEP not enabled
---

bbbc4791cd48ac12996e43c0033b504c79b53639