From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 11 Jul 2011 18:58:22 +0000 (-0400)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetoot... 
X-Git-Tag: v3.1-rc1~316^2~124^2^2~58
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b42c542afbc119c4012324ea80e0c5a89afea4f;p=pandora-kernel.git

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

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

4b42c542afbc119c4012324ea80e0c5a89afea4f
Reading git-diff-tree failed