Vinicius Costa Gomes 208dfd9cd7 Bluetooth: Update the security level when link is encrypted ... If the pending security level is greater than the current security level and the link is now encrypted, we should update the link security level. This is only useful for LE links, when the only event generated when SMP is sucessful in the Encrypt Change event. Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>		2011-07-11 11:59:22 -07:00
..
acpi	Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release	2011-05-29 04:38:48 -04:00
asm-generic	Merge branches 'gpio/merge' and 'spi/merge' of git://git.secretlab.ca/git/linux-2.6	2011-06-17 10:36:32 -07:00
crypto
drm	drm/radeon: workaround a hw bug on some radeon chipsets with all-0 EDIDs.	2011-06-16 16:30:54 +10:00
keys
linux	plist: Remove the need to supply locks to plist heads	2011-07-08 14:15:44 -07:00
math-emu
media	[media] v4l: Fix media_entity_to_video_device macro argument name	2011-06-01 09:42:03 -03:00
mtd	UBI: fix minor stylistic issues	2011-04-14 11:34:41 +03:00
net	Bluetooth: Update the security level when link is encrypted	2011-07-11 11:59:22 -07:00
pcmcia	pcmcia: Make declaration and uses of struct pcmcia_device_id const	2011-05-06 07:46:15 +02:00
rdma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-05-26 12:13:57 -07:00
rxrpc
scsi	[SCSI] libsas: Add option for SATA soft reset	2011-05-26 22:49:33 -05:00
sound	ALSA: sb16 - Fix build errors on MIPS and others with 13bit ioctl size	2011-06-30 15:33:57 +02:00
target	[SCSI] target: Convert REPORT_LUNs to use int_to_scsilun	2011-05-24 13:02:42 -04:00
trace	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4	2011-06-21 10:22:35 -07:00
video	Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-05-24 15:49:57 +09:00
xen	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem	2011-05-26 10:50:56 -07:00
Kbuild