diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-26 16:09:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-26 16:09:30 -0700 |
| commit | 8c876be81a1f2f0ab33ffb2b00871e65c7a658b3 (patch) | |
| tree | 60426265759ab14b00c94a791520f140062bb57c /include/media/soc_camera.h | |
| parent | 02dbd0ff5448d4da0c6e9d59c897f3e31a16d51a (diff) | |
| parent | 347e0899b1c75d907f01ac883ca38d37fe9bfa42 (diff) | |
Merge branch 'char-misc-linus' into char-misc-next
This picks up the MEI fixes that we need in this branch now.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/media/soc_camera.h')
0 files changed, 0 insertions, 0 deletions