Linux 3.4.98

Signed-off-by: Jean Francis Dominique S. Mabalot <jmabalot@google.com>

Conflicts:
	net/bluetooth/hci_conn.c

Conflicts:
	net/bluetooth/hci_conn.c