Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop
authorwdc <wdc@rock-chips.com>
Sat, 24 Mar 2012 08:00:36 +0000 (16:00 +0800)
committerwdc <wdc@rock-chips.com>
Sat, 24 Mar 2012 08:00:36 +0000 (16:00 +0800)
commit68b7e96796761d29ce877611a0d8c3dd302b3545
treecd20045d499587e77e3abec7c4600c6daced2813
parentd84fea59cf3eef0eb8647658134498f6ab57c36e
parentca7d682aabed6f5a898ff3eb1b0eb4446052bdc4
Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop