]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f4927cc) | patch
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)
commite176ed0fa84626aa47362016c06bd6f0c073af41
tree11b7e3926a06a64de8c1708e9da9cf00ae35a0d3tree | snapshot
parentf4927cc23ffbb6040e5a8a312abded3e489d5018commit | diff
ARM: OMAP: Fix merge conflicts manually

Fix merge conflicts manually
drivers/serial/8250.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.