From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Tue, 21 Jun 2011 17:52:56 +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~54^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0555891184a5c18df0e2349872e7ecf9701fc5b5;p=pandora-kernel.git

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

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

0555891184a5c18df0e2349872e7ecf9701fc5b5
Reading git-diff-tree failed