Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorxbw <xbw@rock-chips.com>
Fri, 7 Jun 2013 09:03:20 +0000 (17:03 +0800)
committerxbw <xbw@rock-chips.com>
Fri, 7 Jun 2013 09:03:20 +0000 (17:03 +0800)
commit214813a3f5bb7cd6824a965eebdcb6ea464d7524
tree10c5ece5f3f7ee7b03c66f19fc355b81b1166f70
parentac7caef32e82f624a8eb9ab24acdaeb609c87d1d
parentd09de70e18e2ffa5ac84d3087ea9708a09db2f8b
Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0