Merge branch develop-3.10

author Huang, Tao <huangtao@rock-chips.com>

Wed, 25 Mar 2015 11:10:16 +0000 (19:10 +0800)

committer Huang, Tao <huangtao@rock-chips.com>

Wed, 25 Mar 2015 11:10:16 +0000 (19:10 +0800)
author Huang, Tao <huangtao@rock-chips.com>
Wed, 25 Mar 2015 11:10:16 +0000 (19:10 +0800)
committer Huang, Tao <huangtao@rock-chips.com>
Wed, 25 Mar 2015 11:10:16 +0000 (19:10 +0800)
diff --cc drivers/net/wireless/rockchip_wlan/rtl8723bu/core/rtw_br_ext.c
Simple merge
diff --cc drivers/video/rockchip/transmitter/rk32_mipi_dsi.c
Simple merge
author	Huang, Tao <huangtao@rock-chips.com>
	Wed, 25 Mar 2015 11:10:16 +0000 (19:10 +0800)
committer	Huang, Tao <huangtao@rock-chips.com>
	Wed, 25 Mar 2015 11:10:16 +0000 (19:10 +0800)
		1	2
drivers/net/wireless/rockchip_wlan/rtl8723bu/core/rtw_br_ext.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/rockchip/transmitter/rk32_mipi_dsi.c	patch \|	diff1 \|	diff2 \|	blob \| history