From: Matthew Wilcox <willy@parisc-linux.org>
Date: Mon, 3 Apr 2006 13:44:17 +0000 (+0000)
Subject: [PARISC] Fix up hil_kbd.c mismerge
X-Git-Tag: v2.6.17-rc3~27^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d668da80d613def981c573354e1853e38bd0698d;p=pandora-kernel.git

[PARISC] Fix up hil_kbd.c mismerge

Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
---

Reading git-diff-tree failed