diff options
author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:33 +0800 |
---|---|---|
committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:33 +0800 |
commit | c8e9f05902c6a38b6a85d374c5759ad3d4c2137a (patch) | |
tree | 3d7a4950b1a399a7557b6374dee1b51cf4c66e3c /include/video | |
parent | 093e21c5ca2bd89eb3b5c81b299230bd1dd40a5b (diff) | |
parent | d92a35385ea2c6590e8905001ec57938eb2690d8 (diff) |
Merge branch 'misc/next' into next
* misc/next:
nvmem: imx: correct the fuse word index
nvmem: imx-ocotp: add support for the unaliged word count
MA-11994 Add get phys address ioctl to dma-buf.
staging: android: allow to compile ION unconditionally
Diffstat (limited to 'include/video')
0 files changed, 0 insertions, 0 deletions