Merge branch 'develop' of lbt@10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorroot <root@lbt-desktop.(none)>
Thu, 12 Aug 2010 03:24:29 +0000 (11:24 +0800)
committerroot <root@lbt-desktop.(none)>
Thu, 12 Aug 2010 03:24:29 +0000 (11:24 +0800)

Trivial merge