Marcel Holtmann cd7ca0ec5e Bluetooth: Fix enabling Authenticated Payload Timeout Expired event ... The Authenticated Payload Timeout Expired event is valid for controllers with BR/EDR Secure Connections support, but also for LE only controllers supporting LE Ping feature. When either of them is available enable this event. Previous it was not enabled when the controller was only supporting LE operation. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>		2014-07-09 11:19:15 +03:00
..
acpi	Merge branch 'acpi-video'	2014-06-03 23:12:37 +02:00
asm-generic	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-06-12 19:18:49 -07:00
clocksource
crypto	crypto: hash - Add real ahash walk interface	2014-05-21 20:56:12 +08:00
drm	Merge branch 'drm-next-3.16' of git://people.freedesktop.org/~agd5f/linux into drm-next	2014-06-10 13:09:01 +10:00
dt-bindings	Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-next	2014-06-10 16:53:25 -07:00
keys
kvm
linux	mac80211: add API to request TDLS operation from userspace	2014-06-23 14:28:17 +02:00
math-emu
media	Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-06-12 23:04:28 -07:00
memory
misc
net	Bluetooth: Fix enabling Authenticated Payload Timeout Expired event	2014-07-09 11:19:15 +03:00
pcmcia
ras
rdma	Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next	2014-06-10 10:12:14 -07:00
rxrpc
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2014-06-12 22:38:32 -07:00
sound	ALSA: core: Use ktime_get_ts()	2014-06-12 12:58:16 +02:00
target	target: Report correct response length for some commands	2014-06-11 12:15:30 -07:00
trace	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-06-12 19:42:15 -07:00
uapi	cfg80211: pass TDLS initiator in tdls_mgmt operations	2014-06-23 14:24:55 +02:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-06-12 11:32:30 -07:00
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
Kbuild