Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryxj <yxj@yxj-desktop.(none)>
Fri, 19 Aug 2011 03:24:48 +0000 (11:24 +0800)
committeryxj <yxj@yxj-desktop.(none)>
Fri, 19 Aug 2011 03:24:48 +0000 (11:24 +0800)

Trivial merge