Merge branch 'develop-3.0-rk2928' of ssh://10.10.10.29/rk/kernel into develop-3.0...
authorgwl <gwl@rock-chips.com>
Wed, 15 Aug 2012 13:09:05 +0000 (21:09 +0800)
committergwl <gwl@rock-chips.com>
Wed, 15 Aug 2012 13:09:05 +0000 (21:09 +0800)

Trivial merge