Merge ssh://10.10.10.29/rk/kernel into develop-3.0
authorhjc <hjc@rock-chips.com>
Tue, 26 Feb 2013 06:40:15 +0000 (14:40 +0800)
committerhjc <hjc@rock-chips.com>
Tue, 26 Feb 2013 06:40:15 +0000 (14:40 +0800)

Trivial merge