Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into my
authorli bing <libing@rock-chips.com>
Wed, 20 Aug 2014 00:58:40 +0000 (08:58 +0800)
committerli bing <libing@rock-chips.com>
Wed, 20 Aug 2014 00:58:40 +0000 (08:58 +0800)
commitea128f7084409a25789f0dd0b0040ce38c2ea274
tree435a5f557ddbb9285257db4031d2255d263665a0
parent5d5560503f23a88c605aae37a5ab7e4502aaf7b6
parente0b8a2e5842d2bf64181c68aa34315d5a2a15496
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into my

Conflicts:
arch/arm/boot/dts/rk312x-sdk.dtsi