]> err.no Git - linux-2.6/commit
[PARISC] Fix up hil_kbd.c mismerge
authorMatthew Wilcox <willy@parisc-linux.org>
Mon, 3 Apr 2006 13:44:17 +0000 (13:44 +0000)
committerKyle McMartin <kyle@hera.kernel.org>
Fri, 21 Apr 2006 22:20:34 +0000 (22:20 +0000)
commitd668da80d613def981c573354e1853e38bd0698d
tree756b7e8ede024123c1d487d165c5d7c68ef04d4a
parent8ea6947b4b9d918784fa6a1f93ca2882d94b71b6
[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>
drivers/input/keyboard/hil_kbd.c