Apply linux patch 3.0.84-3.0.85

Conflicts:
	net/bluetooth/l2cap_core.c

Change-Id: I6bebacf44c911de47a1b14b620e4c44f01a9f54a