diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 21:33:50 +0200 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 21:33:50 +0200 |
| commit | dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 (patch) | |
| tree | a3689b801070c1360b120b7280c6adc4de5f692a /arch/arm/mach-omap2/gpmc.h | |
| parent | ARM: OMAP: use consistent error checking (diff) | |
| parent | ARM: OMAP2+: Fix broken gpmc support (diff) | |
| download | linux-dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4.tar.xz linux-dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4.zip | |
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'arch/arm/mach-omap2/gpmc.h')
0 files changed, 0 insertions, 0 deletions