From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Mon, 19 Dec 2011 13:37:53 +0000 (-0200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
X-Git-Tag: v3.3-rc1~182^2~44^2~71^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b0b2f088f12e2ada1297502d7bebde182cf65b0;p=pandora-kernel.git

Merge git://git./linux/kernel/git/padovan/bluetooth

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

4b0b2f088f12e2ada1297502d7bebde182cf65b0
Reading git-diff-tree failed