diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 03:34:41 -0800 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 03:34:41 -0800 |
| commit | 60571f98d292b74586ff8330d8bc965eb01e8df0 (patch) | |
| tree | 8d4f14f4a99b8b465828a314620f3b3aa030713f /arch/arm/mach-omap2/board-omap3touchbook.c | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 6d259a25b56d15ea3cb4b7f2195a188326812d88 (diff) | |
| download | blackbird-op-linux-60571f98d292b74586ff8330d8bc965eb01e8df0.tar.gz blackbird-op-linux-60571f98d292b74586ff8330d8bc965eb01e8df0.zip | |
Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static
Conflicts:
arch/arm/mach-exynos/dma.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5pc100/dma.c
arch/arm/mach-s5pv210/dma.c
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3touchbook.c')
0 files changed, 0 insertions, 0 deletions
