From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 02:36:15 +0000 (+1100)
Subject: Merge remote-tracking branch 'bluetooth/master'
X-Git-Tag: next-20111012~57
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=08590cdecc3a9524312d65a71c4e15a75beda35d;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
---

08590cdecc3a9524312d65a71c4e15a75beda35d