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)

Trivial merge