Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorubuntu <superboy@ubuntu.(none)>
Wed, 23 Mar 2011 01:55:17 +0000 (18:55 -0700)
committerubuntu <superboy@ubuntu.(none)>
Wed, 23 Mar 2011 01:55:17 +0000 (18:55 -0700)
commitf07f39ba0220e3fc1a20b69a09bce00a52f57121
tree6bd7ea6ed4124c8b1c820829ca1658a4b93f8145
parentb1695fb32948db07587dd8ed5a39c1d6a676b0bb
parent497d73bf437ab36446d3fe72687ac67758435bad
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
arch/arm/mach-rk29/board-rk29-fih.c