Merge branch 'develop' of xjh@10.10.10.29:/home/rockchip/kernel into develop_29server
authorxjh <root@ubuntu.(none)>
Wed, 5 Jan 2011 12:47:33 +0000 (20:47 +0800)
committerxjh <root@ubuntu.(none)>
Wed, 5 Jan 2011 12:47:33 +0000 (20:47 +0800)
commit29eb326bc77f71c2fcb597d5f91af5db7ac9d326
tree6543d4f6e0cd7665d2be80015512d60cfc383a85
parent9376ee5a1b3eca2279d021b595a4c3da7bf935e2
parent1b557e787e04eba644b6dd3e17efb09bbc99e7e5
Merge branch 'develop' of xjh@10.10.10.29:/home/rockchip/kernel into develop_29server