From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Oct 2011 02:07:25 +0000 (+1100)
Subject: Merge remote-tracking branch 'bluetooth/master'
X-Git-Tag: next-20111006~56
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6343d2a588e96117a1a4be108e112bc7c32af293;p=karo-tx-linux.git

Merge remote-tracking branch 'bluetooth/master'

Conflicts:
	net/bluetooth/hci_core.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/mgmt.c
	net/bluetooth/smp.c
---

6343d2a588e96117a1a4be108e112bc7c32af293