From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 29 Apr 2011 19:28:49 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto... 
X-Git-Tag: v3.0-rc2~7^2~16^2~227
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=dee04cac28b5f8a99e002ec1b2e0a49f3155bda0;p=~emulex%2Finfiniband.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
---

dee04cac28b5f8a99e002ec1b2e0a49f3155bda0