Merge remote-tracking branch 'media_tree/vsp1' into generic-zpos-v8
authorBenjamin Gaignard <benjamin.gaignard@linaro.org>
Fri, 29 Jul 2016 07:38:55 +0000 (09:38 +0200)
committerBenjamin Gaignard <benjamin.gaignard@linaro.org>
Fri, 29 Jul 2016 07:38:55 +0000 (09:38 +0200)
commit62c2cd0f49333a2bb53602ec23039ca99a19cb9d
tree82ce682c6902ebe63275a60bdc3d406b26f09c84
parenta1f5524a66ff6284d1380cdd7723de82698ff9d3
parent894dde5c5d1c6d33c4bd3d4384c6cf0aff3f8015
Merge remote-tracking branch 'media_tree/vsp1' into generic-zpos-v8
MAINTAINERS
drivers/media/usb/uvc/uvc_v4l2.c
drivers/of/of_reserved_mem.c
include/linux/of_reserved_mem.h