Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Sun, 23 Jan 2011 10:49:30 +0000 (18:49 +0800)
committerlhh <lhh@rock-chips.com>
Sun, 23 Jan 2011 10:49:30 +0000 (18:49 +0800)

Trivial merge