Marcel Holtmann db3aebf4a1 Bluetooth: Remove duplicate definitions for advertising event types ...

The constants for advertising event types have been defined twice. So
remove one copy of it.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

2013-10-16 10:31:48 +03:00

..

acpi

Merge branch 'acpi-hotplug'

2013-08-30 14:14:25 +02:00

asm-generic

Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 09:36:54 -07:00

clocksource

Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-09-06 13:21:16 -07:00

crypto

crypto: scatterwalk - Add support for calculating number of SG elements

2013-08-21 21:27:58 +10:00

drm

drm/exynos: fimd: replace struct fb_videomode with videomode

2013-09-05 13:43:44 +09:00

dt-bindings

Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-09-06 13:26:27 -07:00

keys

…

kvm

ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256

2013-08-30 16:12:39 +03:00

linux

lockref: add ability to mark lockrefs "dead"

2013-09-07 15:49:18 -07:00

math-emu

…

media

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-09-05 14:54:29 -07:00

memory

…

misc

…

net

Bluetooth: Remove duplicate definitions for advertising event types

2013-10-16 10:31:48 +03:00

pcmcia

…

ras

…

rdma

Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next

2013-09-03 09:01:08 -07:00

rxrpc

…

scsi

[SCSI] Generate uevents on certain unit attention codes

2013-08-26 18:52:27 +04:00

sound

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2013-09-05 11:55:59 -07:00

target

…

trace

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2013-09-04 17:19:27 -07:00

uapi

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2013-09-07 14:34:07 -07:00

video

Merge tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2013-09-05 09:49:32 -07:00

xen

Merge tag 'stable/for-linus-3.12-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2013-09-04 17:45:39 -07:00

Kbuild

…