Merge branch 'develop' of lhh@10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorlhh <lhh@rock-chips.com>
Sat, 10 Jul 2010 10:09:44 +0000 (18:09 +0800)
committerlhh <lhh@rock-chips.com>
Sat, 10 Jul 2010 10:09:44 +0000 (18:09 +0800)
commit1ecccb09cdeb84329ca8ae836f8342a89ceb4b60
tree9c7e6f4020c073ea879d61ea4aafd7d90c2a2155
parent777ea0fbe3c42367a3caa971b8a06f7b696ffd98
parentf7bca875ca1736a6ab974bc03ca3c90a47a42cee
Merge branch 'develop' of lhh@10.10.10.201:/home/rockchip/rk2818/kernel into develop