diff options
author | Tony Lindgren <tony@atomide.com> | 2012-11-09 14:54:17 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-11-09 14:54:17 -0800 |
commit | f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37 (patch) | |
tree | a9ce4f46ea3b2e516698b2c3817e40414a8bbf51 /arch/arm/mach-ks8695 | |
parent | 84fbd2b8c8da49b4e53fcb484a1564a9b5da61b3 (diff) | |
parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
download | blackbird-op-linux-f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37.tar.gz blackbird-op-linux-f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37.zip |
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolved as suggested by Jon Hunter.
Diffstat (limited to 'arch/arm/mach-ks8695')
0 files changed, 0 insertions, 0 deletions