From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Thu, 21 Apr 2011 00:47:07 +0000 (-0300)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
X-Git-Tag: v3.0-rc1~377^2~161^2^2~40^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=828d7d7b19446bf5a40928da47955c575a454c75;p=pandora-kernel.git

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

Conflicts:
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c
---

828d7d7b19446bf5a40928da47955c575a454c75
Reading git-diff-tree failed