fix merge derp
	modified:   net/bluetooth/hci_event.c

Change-Id: I0e4f5471a04abd37dacfeb5aa5f0313f910bd9c4