Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorubuntu <superboy@ubuntu.(none)>
Thu, 24 Mar 2011 01:59:30 +0000 (18:59 -0700)
committerubuntu <superboy@ubuntu.(none)>
Thu, 24 Mar 2011 01:59:30 +0000 (18:59 -0700)
commit5dc059f53f03e3a293f1816ce4cda654298ab867
treec89821294b5758fa7c76a86c8d080953570a41f1
parentd2f54d59ed7f842a13e97a05a54c747cc7cdc653
parent276f88f33825119afd9a787833af283242d463b4
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop