From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 28 Jul 2010 20:17:49 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet... 
X-Git-Tag: v2.6.36-rc1~571^2~64^2~18
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=099284bdecf6e0af78662371ed3f45b71d796aad;p=users%2Fjedix%2Flinux-maple.git

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

099284bdecf6e0af78662371ed3f45b71d796aad