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)
commit6f1b688f7971145091170b96f6eb4990dad7d5c9
tree61f0bfea934429faff4c3ff063d2491dec57e775
parent25ad743f6425f12f81a76e3a7d04a5da6f0b86d8
parentcb407500b891abdc8ec89f7e2c123976c35aa8a5
Merge branch develop-3.10

Conflicts:
drivers/staging/android/ion/rockchip/rockchip_ion.c
drivers/mmc/host/rk_sdmmc.c
sound/soc/codecs/Kconfig