From: Alan Cox <alan@redhat.com>
Date: Tue, 22 Jul 2008 10:08:53 +0000 (+0100)
Subject: ttydev: Fix up compile failures in the PPC build
X-Git-Tag: v2.6.27-rc1~937
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aa3692da57c773e5c76de55c5c4a953962d360e;p=pandora-kernel.git

ttydev: Fix up compile failures in the PPC build

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>
---

Reading git-diff-tree failed