projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2b0460b) | patch
fix adbhid mismerge
authorAl Viro <viro@ftp.linux.org.uk>
Wed, 17 Oct 2007 00:02:46 +0000 (01:02 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 17 Oct 2007 02:04:49 +0000 (19:04 -0700)
commit68f3e6622bb60c6b477971b56d1913077834fdcd
tree748598aa546b88c05e7a67ed723934e51b910cadtree | snapshot
parent2b0460b534f383eca744eb8fff66ec9f57e702b9commit | 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>
drivers/macintosh/adbhid.c diff | blob | history
John Crispins staging tree