Linux 3.4.96

Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>
Linux 3.4.97
Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>.
Linux 3.4.98

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

Conflicts:
	net/bluetooth/hci_conn.c