diff options
author | Matthew Wilcox <willy@parisc-linux.org> | 2006-04-03 13:44:17 (GMT) |
---|---|---|
committer | Kyle McMartin <kyle@hera.kernel.org> | 2006-04-21 22:20:34 (GMT) |
commit | d668da80d613def981c573354e1853e38bd0698d (patch) | |
tree | 756b7e8ede024123c1d487d165c5d7c68ef04d4a /arch/parisc/kernel/head.S | |
parent | 8ea6947b4b9d918784fa6a1f93ca2882d94b71b6 (diff) | |
download | linux-fsl-qoriq-d668da80d613def981c573354e1853e38bd0698d.tar.xz |
[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>
Diffstat (limited to 'arch/parisc/kernel/head.S')
0 files changed, 0 insertions, 0 deletions