| commit | dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 | [log] [tgz] |
|---|---|---|
| author | Jon Hunter <jon-hunter@ti.com> | Mon Apr 01 14:33:50 2013 -0500 |
| committer | Jon Hunter <jon-hunter@ti.com> | Mon Apr 01 14:33:50 2013 -0500 |
| tree | a3689b801070c1360b120b7280c6adc4de5f692a | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 [diff] | |
| parent | 31d9adca82ce65e5c99d045b5fd917c702b6fce3 [diff] |
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp Conflicts: arch/arm/plat-omap/dmtimer.c