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)

Trivial merge