| commit | 68f3e6622bb60c6b477971b56d1913077834fdcd | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@ftp.linux.org.uk> | Wed Oct 17 01:02:46 2007 +0100 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Oct 16 19:04:49 2007 -0700 |
| tree | 748598aa546b88c05e7a67ed723934e51b910cad | |
| parent | 2b0460b534f383eca744eb8fff66ec9f57e702b9 [diff] |
fix adbhid mismerge This fixes a lost 'key' variable declaration that went missing in a mismerge (commit b981d8b3f5e008ff10d993be633ad00564fc22cd) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>