diff options
| author | Al Viro <[email protected]> | 2007-10-17 00:02:46 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2007-10-17 02:04:49 +0000 |
| commit | 68f3e6622bb60c6b477971b56d1913077834fdcd (patch) | |
| tree | 748598aa546b88c05e7a67ed723934e51b910cad /fs/proc/array.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | kernel-68f3e6622bb60c6b477971b56d1913077834fdcd.tar.gz kernel-68f3e6622bb60c6b477971b56d1913077834fdcd.zip | |
fix adbhid mismerge
This fixes a lost 'key' variable declaration that went missing in a
mismerge (commit b981d8b3f5e008ff10d993be633ad00564fc22cd)
Signed-off-by: Al Viro <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions