From: Alex Shi <alex.shi@linaro.org>
Date: Mon, 9 Jun 2014 04:57:26 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~110
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=69284a3b89dbc6a8fccf5e571bb1279ddf226cfc;p=firefly-linux-kernel-4.4.55.git

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

69284a3b89dbc6a8fccf5e571bb1279ddf226cfc
diff --cc net/bluetooth/hci_event.c
index cb6e36925535,ab2ec7c414cb..eb41886fd9f4
mode 100755,100644..100755
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c