From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 11 Oct 2011 04:08:24 +0000 (+1100)
Subject: Merge remote-tracking branch 'bluetooth/master'
X-Git-Tag: next-20111011~57
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0c395c77af844fe2bdc9f3821f6d7fb2b8714db8;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
---

0c395c77af844fe2bdc9f3821f6d7fb2b8714db8