From: Mark Brown <broonie@linaro.org>
Date: Wed, 7 May 2014 08:50:19 +0000 (+0100)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~137
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6ba9615888ad3c49af92bc307f6ff231bc0bc0d7;p=firefly-linux-kernel-4.4.55.git

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

6ba9615888ad3c49af92bc307f6ff231bc0bc0d7
diff --cc net/bluetooth/hci_event.c
index 49d5c941c9c7,cfca44f8d048..cb6e36925535
mode 100755,100644..100755
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c