From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date: Tue, 12 Jun 2012 01:36:42 +0000 (-0300)
Subject: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot... 
X-Git-Tag: v3.6-rc1~125^2~57^2~2^2~48
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbe461c526e1e0f8b55f91180df64f02d8daed45;p=pandora-kernel.git

Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth

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

cbe461c526e1e0f8b55f91180df64f02d8daed45
Reading git-diff-tree failed