From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 9 Nov 2011 19:54:33 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto... 
X-Git-Tag: v3.3-rc1~182^2~545^2~134
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=312fef7d18adda2be822d31916547f84ed6af28b;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-next

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

312fef7d18adda2be822d31916547f84ed6af28b
Reading git-diff-tree failed