Merge branch 'develop' of dxj@10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorroot <root@dxj.(none)>
Fri, 23 Jul 2010 10:02:54 +0000 (18:02 +0800)
committerroot <root@dxj.(none)>
Fri, 23 Jul 2010 10:02:54 +0000 (18:02 +0800)
commit5e2daccc20f4e3520b9b7bc9fcf2dfd38ef3ef4c
tree22e469bdce7363d9e529eeb005323133ddbdcf50
parente218797012b74bcaf8cddc3dd9973f24fb342caf
parentc57328247eaf32f75c4408ad31f4a3c73bc7bd26
Merge branch 'develop' of dxj@10.10.10.201:/home/rockchip/rk2818/kernel into develop