From: Huang, Tao <huangtao@rock-chips.com>
Date: Tue, 27 Oct 2015 09:35:20 +0000 (+0800)
Subject: Merge branch 'android-3.10'
X-Git-Tag: firefly_0821_release~3678
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=800979108b0b2a6377bca5dd61084a42a72f0b30;p=firefly-linux-kernel-4.4.55.git

Merge branch 'android-3.10'

Exclude:
ext4 crypto
nl80211: fix scheduled scan RSSI matchset attribute confusion
mmc
Add wlan platform partial_resume handler
wlan: Add WLAN_PLAT_AP_FLAG for SOFTAP country code
ipc
zram
---

800979108b0b2a6377bca5dd61084a42a72f0b30