From: Mark Brown <broonie@linaro.org>
Date: Mon, 14 Oct 2013 10:27:26 +0000 (+0100)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~205
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=acaf699b4e42227a3e4d23ab0d33af02fa3f4fa0;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
---

acaf699b4e42227a3e4d23ab0d33af02fa3f4fa0
diff --cc net/bluetooth/hci_event.c
index 1cd90753d1cb,dcaa6dbbab2c..49d5c941c9c7
mode 100755,100644..100755
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c