| commit | f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Fri Nov 09 14:54:17 2012 -0800 |
| committer | Tony Lindgren <tony@atomide.com> | Fri Nov 09 14:54:17 2012 -0800 |
| tree | a9ce4f46ea3b2e516698b2c3817e40414a8bbf51 | |
| parent | 84fbd2b8c8da49b4e53fcb484a1564a9b5da61b3 [diff] | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 [diff] |
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.