aboutsummaryrefslogtreecommitdiff
path: root/lib/inflate.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-17 01:02:46 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 19:04:49 -0700
commit68f3e6622bb60c6b477971b56d1913077834fdcd (patch)
tree748598aa546b88c05e7a67ed723934e51b910cad /lib/inflate.c
parent2b0460b534f383eca744eb8fff66ec9f57e702b9 (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>
Diffstat (limited to 'lib/inflate.c')
0 files changed, 0 insertions, 0 deletions