git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ede8508)
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)
Fixed merge conflict in board.h before syncing with mainline


No differences found
Pandora Kernel Repository