Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
authorxbw <xbw@rock-chips.com>
Thu, 15 Dec 2011 03:06:19 +0000 (11:06 +0800)
committerxbw <xbw@rock-chips.com>
Thu, 15 Dec 2011 03:06:19 +0000 (11:06 +0800)
commitc01cc9308ea0a5c3ef0d8c62b6763deee94b3900
tree56891471f2704d7de1882fd79a32e6186c27b73b
parent94768d3d9eba1779df1c6cd8ed3bfaa1a68438f3
parentb25fc8f5f69e4ae457f1679c01eb9d45eaa1dd04
Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0