From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Oct 2011 02:28:13 +0000 (+1100)
Subject: Merge remote-tracking branch 'bluetooth/master'
X-Git-Tag: next-20111014~59
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d034ab249b3e62ad9ae28b5199e43c8049ec6b56;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
---

d034ab249b3e62ad9ae28b5199e43c8049ec6b56