Lukasz Rymanowski 3d5a76f08b Bluetooth: Keep msec in DISCOV_LE_TIMEOUT ... To be consistent, lets use msec for this timeout as well. Note: This define value is a minimum scan time taken from BT Core spec 4.0, Vol 3, Part C, chapter 9.2.6 Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>		2014-03-28 00:09:30 -07:00
..
acpi	Merge branches 'acpi-processor', 'acpi-hotplug', 'acpi-init', 'acpi-pm' and 'acpica'	2014-01-29 11:47:18 +01:00
asm-generic	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2014-01-27 21:03:39 -08:00
clocksource
crypto
drm	drm/tegra: Changes for v3.14-rc1 (update)	2014-01-29 12:03:56 +10:00
dt-bindings	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2014-01-30 17:07:18 -08:00
keys
kvm	KVM: arm-vgic: Set base addr through device API	2013-12-21 10:01:22 -08:00
linux	Bluetooth: allocate static minor for vhci	2014-02-18 09:49:04 -08:00
math-emu	math-emu: fix floating-point to integer overflow detection	2014-01-07 18:36:24 -06:00
media	[media] saa6588: add support for non-blocking mode	2014-01-07 07:42:19 -02:00
memory
misc
net	Bluetooth: Keep msec in DISCOV_LE_TIMEOUT	2014-03-28 00:09:30 -07:00
pcmcia
ras
rdma	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
rxrpc
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2014-01-31 15:31:23 -08:00
sound	ARM: SoC board updates for 3.14	2014-01-23 18:48:28 -08:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2014-01-31 15:31:23 -08:00
trace	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-01-31 09:31:14 -08:00
uapi	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-02-12 15:24:14 -05:00
video	video: pxa168fb: Cleanup pxa168fb.h file	2014-01-17 10:57:43 +02:00
xen	Bug-fixes:	2014-02-05 16:01:11 -08:00
Kbuild