From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Dec 2011 22:15:01 +0000 (-0800)
Subject: Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v3.2-rc6~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=88703f27758211fdda9bbbdf837330b27479e2b9;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: r8712u: Add new USB ID
  staging: tidspbridge: request dmtimer clocks on init
  staging: tidspbridge: include module.h by default
---

88703f27758211fdda9bbbdf837330b27479e2b9