Vinicius Costa Gomes
cc110922da
Bluetooth: Change signature of smp_conn_security() ...
To make it clear that it may be called from contexts that may not have
any knowledge of L2CAP, we change the connection parameter, to receive
a hci_conn.
This also makes it clear that it is checking the security of the link.
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
2012-08-27 08:07:18 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
drm/exynos: add property for plane zpos
2012-07-27 11:13:54 +09:00
bcma: BCM43228 support
2012-08-02 13:51:46 -04:00
[media] v4l2: add core support for the new VIDIOC_ENUM_FREQ_BANDS ioctl
2012-07-30 20:23:05 -03:00
Bluetooth: Change signature of smp_conn_security()
2012-08-27 08:07:18 -07:00
Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus
2012-07-22 23:26:17 -07:00
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
2012-07-25 15:58:48 -04:00
Sound fixes for 3.6-rc1
2012-08-01 10:42:26 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-31 19:25:39 -07:00
video: da8xx-fb: configure FIFO threshold to reduce underflow errors
2012-07-29 01:11:09 +00:00
cc110922da