From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 3 Mar 2014 19:59:12 +0000 (-0500)
Subject: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot... 
X-Git-Tag: v3.15-rc1~113^2~159^2^2~37
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9ffd2e9a174769913dcce0fbc9223b58d2eb5526;p=~emulex%2Finfiniband.git

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
---

9ffd2e9a174769913dcce0fbc9223b58d2eb5526