Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorubuntu <superboy@ubuntu.(none)>
Tue, 22 Mar 2011 09:07:51 +0000 (02:07 -0700)
committerubuntu <superboy@ubuntu.(none)>
Tue, 22 Mar 2011 09:07:51 +0000 (02:07 -0700)

Trivial merge