git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d35cb36)
ttydev: Fix up compile failures in the PPC build
authorAlan Cox <alan@redhat.com>
Tue, 22 Jul 2008 10:08:53 +0000 (11:08 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jul 2008 20:03:22 +0000 (13:03 -0700)
Fix up a couple of reported merge problems

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/serial/icom.c patch | blob | history
drivers/serial/serial_txx9.c patch | blob | history

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