From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Thu, 9 Jun 2011 19:33:54 +0000 (-0300)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
X-Git-Tag: v3.1-rc1~316^2~350^2^2~124
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=448f2627c169092d2091a1be22feb6a7775f6201;p=pandora-kernel.git

Merge /linux/kernel/git/padovan/bluetooth-2.6

Conflicts:
	net/bluetooth/rfcomm/sock.c
---

448f2627c169092d2091a1be22feb6a7775f6201
Reading git-diff-tree failed