Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

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

Conflicts:
drivers/usb/gadget/f_mass_storage.c

Unnamed repository; edit this file 'description' to name the repository.

arch/arm/mach-rk29/board-rk29phonepadsdk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/vpu_mem.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rk29/vpu_service.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/f_mass_storage.c	diff1 \|	diff2 \|	blob \| history
drivers/video/backlight/rk29_backlight.c	diff1 \|	diff2 \|	blob \| history