diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-11-23 14:51:50 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-11-23 14:51:50 -0800 |
| commit | 7f6080975015b3feb1e086c5d328c7b28c228eb6 (patch) | |
| tree | 52871a92bca207665a0258aa30c12e1dba546642 /Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf | |
| parent | b26baffbc91693c9a3b81704a4870a474f169871 (diff) | |
| parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) | |
Merge 4.4-rc2 into staging-next
We want those fixes in here to resolve merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf')
0 files changed, 0 insertions, 0 deletions