Merge remote-tracking branch 'remotes/kernel-2.6.32/develop' into develop-2.6.36
author黄涛 <huangtao@rock-chips.com>
Mon, 1 Aug 2011 04:16:19 +0000 (12:16 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 1 Aug 2011 04:16:19 +0000 (12:16 +0800)
commit8680927736b7e032489eaccf591d45b42d9f2c94
tree507a229fde826847ea227a72b19ccb486bf0bc9f
parent520cc155a8d7d964faeda2e06108f3b72a961d74
parentf2fa41463e844ae8f80ad0aa7538e6f0990fae37
Merge remote-tracking branch 'remotes/kernel-2.6.32/develop' into develop-2.6.36
arch/arm/mach-rk29/vpu_service.c