Linux 3.4.93

Conflicts:
	net/bluetooth/l2cap_core.c