From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 15 Jan 2013 04:45:19 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
X-Git-Tag: firefly_0821_release~7949
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e1c56a82b56c1f26a2de88c848d33bcf71a01812;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Merge v3.0.58
Conflicts:
	Makefile
	drivers/net/wireless/p54/p54usb.c
---

e1c56a82b56c1f26a2de88c848d33bcf71a01812
diff --cc net/bluetooth/hci_core.c
index 0c81430fec8c,7cd007291d1c..1dabd7640446
mode 100755,100644..100755
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c