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)
commit800979108b0b2a6377bca5dd61084a42a72f0b30
tree51934c9435773865884610676990c874c3325b0e
parentf40cf81b65d1431e358991b06a79da0b0ff1b0b4
parentd7670225d3e1748ac506a4ca2864fd8503a9883a
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