diff options
| author | Sekhar Nori <nsekhar@ti.com> | 2017-01-31 16:15:32 +0100 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2017-01-31 16:15:32 +0100 |
| commit | b88a10765471cff87025794fbe1ccaa96c7945a8 (patch) | |
| tree | 01f69e2fbf6842cece34a47be7574938b87ade48 /arch/arm/mach-davinci/Makefile | |
| parent | ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for SATA (diff) | |
| parent | bus: da850-mstpri: fix my e-mail address (diff) | |
| download | linux-b88a10765471cff87025794fbe1ccaa96c7945a8.tar.xz linux-b88a10765471cff87025794fbe1ccaa96c7945a8.zip | |
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/Makefile')
0 files changed, 0 insertions, 0 deletions