Merge branch 'develop' of xjh@10.10.10.29:/home/rockchip/kernel into develop_29server
authorxjh <root@ubuntu.(none)>
Sat, 12 Feb 2011 09:04:51 +0000 (17:04 +0800)
committerxjh <root@ubuntu.(none)>
Sat, 12 Feb 2011 09:04:51 +0000 (17:04 +0800)
commitb6b406a50f874c6467bbe1eeeb5998208ce8f4ae
tree6f0e6e053b570bc8acacaa9bd40dfe688f5de99e
parent33551f0cc482c433345666a65039dcb04749467f
parentf1d6966364f28d0791b3d5a342c7fddb10446305
Merge branch 'develop' of xjh@10.10.10.29:/home/rockchip/kernel into develop_29server