git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f4927cc)
ARM: OMAP: Fix merge conflicts manually
authorTony Lindgren <tony@atomide.com>
Mon, 13 Feb 2006 17:50:03 +0000 (09:50 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 13 Feb 2006 17:50:03 +0000 (09:50 -0800)
Fix merge conflicts manually

drivers/serial/8250.c patch | blob | history

diff --cc drivers/serial/8250.c
Simple merge
Pandora Kernel Repository