Merge remote-tracking branch 'kernel-2.6.32/develop' into develop-2.6.36

author 黄涛 <huangtao@rock-chips.com>

Wed, 24 Aug 2011 02:32:50 +0000 (10:32 +0800)

committer 黄涛 <huangtao@rock-chips.com>

Wed, 24 Aug 2011 02:32:50 +0000 (10:32 +0800)
author 黄涛 <huangtao@rock-chips.com>
Wed, 24 Aug 2011 02:32:50 +0000 (10:32 +0800)
committer 黄涛 <huangtao@rock-chips.com>
Wed, 24 Aug 2011 02:32:50 +0000 (10:32 +0800)
diff --cc arch/arm/mach-rk29/board-rk29phonepadsdk.c
Simple merge
diff --cc arch/arm/mach-rk29/vpu_mem.c
Simple merge
diff --cc arch/arm/mach-rk29/vpu_service.c
Simple merge
diff --cc drivers/usb/gadget/f_mass_storage.c
Simple merge
diff --cc drivers/video/backlight/rk29_backlight.c
Simple merge
author	黄涛 <huangtao@rock-chips.com>
	Wed, 24 Aug 2011 02:32:50 +0000 (10:32 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Wed, 24 Aug 2011 02:32:50 +0000 (10:32 +0800)
		1	2
arch/arm/mach-rk29/board-rk29phonepadsdk.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/vpu_mem.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/vpu_service.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/f_mass_storage.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/rk29_backlight.c	patch \|	diff1 \|	diff2 \|	blob \| history