]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
ARM: OMAP: Fixed merge conflicts
authorTony Lindgren <tony@atomide.com>
Tue, 13 Sep 2005 10:32:45 +0000 (13:32 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 13 Sep 2005 10:32:45 +0000 (13:32 +0300)
commitabc9491df2d5c50f6851f7f50f04d35014585789
tree741bfdd70e41259ff5f4f763c5e8b96309c1be52
parent1f08c73e2707e9e8aa2365910b98e3a97803087c
ARM: OMAP: Fixed merge conflicts

Fixed merge conflicts
drivers/video/Kconfig
include/asm-arm/cacheflush.h
include/linux/fb.h
sound/arm/Makefile