diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-11 14:37:45 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-11 14:37:45 -0700 |
| commit | ecdf94da6f91310d08081e05db78a6c997b44e4b (patch) | |
| tree | 0528ddc7e2b34046b3bd98dedf89ca7fee40c1ae /scripts/objdiff | |
| parent | Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kge... (diff) | |
| parent | Linux 4.1-rc6 (diff) | |
| download | linux-ecdf94da6f91310d08081e05db78a6c997b44e4b.tar.gz linux-ecdf94da6f91310d08081e05db78a6c997b44e4b.zip | |
Merge tag 'v4.1-rc6' into next/dt
Linux 4.1-rc6
Conflicts:
arch/arm/boot/dts/zynq-7000.dtsi
Resolution summary:
Mainline had an earlier version of the commit, resolve in favor of the
newer patch in next/dt branch.
Diffstat (limited to 'scripts/objdiff')
0 files changed, 0 insertions, 0 deletions