Johan Hedberg 595177f311 Bluetooth: Fix LE L2CAP Connect Request handling together with SMP ... Unlike BR/EDR, for LE when we're in the BT_CONNECT state we may or may not have already have sent the Connect Request. This means that we need some extra tracking of the request. This patch adds an extra channel flag to prevent the request from being sent a second time. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>		2013-12-05 07:05:35 -08:00
..
acpi	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
asm-generic	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
clocksource
crypto
drm	Merge tag 'bdw-stage1-2013-11-08-v2' of git://people.freedesktop.org/~danvet/drm-intel into drm-next	2013-11-10 18:35:33 +10:00
dt-bindings	For the 3.13 merge window we have a couple of new drivers for the AMS	2013-11-15 16:37:40 -08:00
keys
kvm
linux	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2013-12-02 14:25:38 -05:00
math-emu
media	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
memory
misc
net	Bluetooth: Fix LE L2CAP Connect Request handling together with SMP	2013-12-05 07:05:35 -08:00
pcmcia
ras
rdma	Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next	2013-11-17 08:22:19 -08:00
rxrpc
scsi	Main batch of InfiniBand/RDMA changes for 3.13:	2013-11-18 15:36:04 -08:00
sound	Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next	2013-11-08 10:43:40 +00:00
target
trace	This batch of changes is mostly clean ups and small bug fixes.	2013-11-16 12:23:18 -08:00
uapi	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2013-12-02 14:25:38 -05:00
video	fbdev changes for 3.13	2013-11-14 14:44:20 +09:00
xen	Features:	2013-11-15 13:34:37 +09:00
Kbuild