From: Al Viro <viro@ftp.linux.org.uk>
Date: Wed, 17 Oct 2007 00:02:46 +0000 (+0100)
Subject: fix adbhid mismerge
X-Git-Tag: v2.6.24-rc1~821
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68f3e6622bb60c6b477971b56d1913077834fdcd;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed