Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>