Apply linux patch 3.0.84-3.0.85

Conflicts:
	net/bluetooth/l2cap_core.c

Change-Id: Ia3387ae6cf18dfef68d7189b45243b851e7be706