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)
1  2 
arch/arm/mach-rk29/board-rk29-fih.c

Simple merge