diff options
| author | Sekhar Nori <nsekhar@ti.com> | 2017-01-31 20:45:32 +0530 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2017-01-31 20:45:32 +0530 |
| commit | b88a10765471cff87025794fbe1ccaa96c7945a8 (patch) | |
| tree | 01f69e2fbf6842cece34a47be7574938b87ade48 /arch/arm/mach-davinci/pm.c | |
| parent | 57a66aafda62aacd15f0d1f4f260cc0efdf1d0e4 (diff) | |
| parent | 430d7dd448f48f54e79614ca237f44cd543f73da (diff) | |
Merge branch 'v4.11/fixes-non-critical' into v4.11/soc
This merge is because patches in branch v4.11/soc conflict
with cleanup done as part of 0a5011673af0 ("ARM: davinci:
da850: coding style fix") that is already queued as a
non-critical fix.
Diffstat (limited to 'arch/arm/mach-davinci/pm.c')
0 files changed, 0 insertions, 0 deletions