From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 15 Apr 2014 04:51:10 +0000 (+0800)
Subject: Merge tag 'lsk-android-14.03' into develop-3.10
X-Git-Tag: firefly_0821_release~5555
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0ffd56dafe02b40ec2a7a61e8c74b0061add0677;p=firefly-linux-kernel-4.4.55.git

Merge tag 'lsk-android-14.03' into develop-3.10

lsk 14.03 Android release
---

0ffd56dafe02b40ec2a7a61e8c74b0061add0677
diff --cc drivers/usb/core/hcd.c
index 176f8af0d576,d53547d2e4c7..01a518b927ea
mode 100755,100644..100755
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
diff --cc drivers/usb/core/hub.c
index e1d00f011bfc,3a2eb4cc8959..5b2dfded66f8
mode 100755,100644..100755
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c