Squashed update of kernel from 3.4.2 to 3.4.3
Squashed update of kernel from 3.4.3 to 3.4.4
Squashed update of kernel from 3.4.4 to 3.4.5
Squashed update of kernel from 3.4.5 to 3.4.6
Squashed update of kernel from 3.4.6 to 3.4.7
Squashed update of kernel from 3.4.7 to 3.4.8
Squashed update of kernel from 3.4.8 to 3.4.9
Squashed update of kernel from 3.4.9 to 3.4.10
Squashed update of kernel from 3.4.10 to 3.4.11
Squashed update of kernel from 3.4.11 to 3.4.12
Bluetooth: Clean up logic in hci_cc_write_scan_enable

This patch adds a new label to hci_cc_write_scan_enable to avoid
unnecessary indentation. This will be convenient especially when new
code for the discoverable timeout gets added.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

Conflicts:
	net/bluetooth/hci_event.c
Bluetooth: Fix reason code for pairing rejection

"Pairing not allowed" is 0x18 and not 0x16.

Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Bluetooth: Define HCI reasons instead of magic number

Use HCI error reasons instead of magic numbers.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

Conflicts:
	net/bluetooth/hci_conn.c
	net/bluetooth/l2cap_core.c
Bluetooth: Add timeout field to mgmt_set_discoverable

Based on the revised mgmt API set_discoverable has a timeout parameter
to specify how long the adapter will remain discoverable. A value of 0
means "indefinitively".

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Squashed update of kernel from 3.4.12 to 3.4.13
Squashed update of kernel from 3.4.13 to 3.4.14
Squashed update of kernel from 3.4.14 to 3.4.15
Squashed update of kernel from 3.4.15 to 3.4.16
Squashed update of kernel from 3.4.16 to 3.4.17
Squashed update of kernel from 3.4.17 to 3.4.18