Merge branch develop-3.10
authorHuang, Tao <huangtao@rock-chips.com>
Thu, 5 Mar 2015 02:21:27 +0000 (10:21 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Thu, 5 Mar 2015 02:21:27 +0000 (10:21 +0800)
Conflicts:
drivers/staging/android/ion/rockchip/rockchip_ion.c

1  2 
drivers/mmc/host/rk_sdmmc.c
sound/soc/codecs/Kconfig

Simple merge
Simple merge