From: Mark Brown <broonie@linaro.org>
Date: Mon, 14 Jul 2014 09:46:05 +0000 (+0100)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~88
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e503fc621facb9f21bee519e94adbf0061d445f8;p=firefly-linux-kernel-4.4.55.git

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

e503fc621facb9f21bee519e94adbf0061d445f8
diff --cc net/bluetooth/hci_event.c
index eb41886fd9f4,5daf7ab26710..1526fb232b3f
mode 100755,100644..100755
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c