Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author陈恒明 <chm@rock-chips.com>
Sat, 4 Dec 2010 02:03:27 +0000 (18:03 -0800)
committer陈恒明 <chm@rock-chips.com>
Sat, 4 Dec 2010 02:03:27 +0000 (18:03 -0800)

Trivial merge