]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ede8508) | patch
ARM: OMAP: Fixed merge conflict in board.h before syncing with mainline
authorTony Lindgren <tony@atomide.com>
Thu, 28 Jul 2005 09:04:00 +0000 (02:04 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 Jul 2005 09:04:00 +0000 (02:04 -0700)
commit3856bce7f6699f3a9749124cfb07f9c907c33e9f
treedf798fc81bffc534f143dc39663fc2a51a388a2etree | snapshot
parentede850831dfc6752f8b0c5985fcd27e134166e44commit | diff
ARM: OMAP: Fixed merge conflict in board.h before syncing with mainline

Fixed merge conflict in board.h before syncing with mainline
include/asm-arm/arch-omap/board.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.