Merge branch 'android-3.10'
authorHuang, Tao <huangtao@rock-chips.com>
Tue, 27 Oct 2015 09:35:20 +0000 (17:35 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Tue, 27 Oct 2015 09:35:20 +0000 (17:35 +0800)
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


Trivial merge