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)

Trivial merge