]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d987e7e) | 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)
commitc6ccd489ee2caf9beac27316f6a5b561be70e689
tree748598aa546b88c05e7a67ed723934e51b910cadtree | snapshot
parentd987e7ef175ab11800e60fdb33a5f42a0bcefad2commit | diff
fix adbhid mismerge

This fixes a lost 'key' variable declaration that went missing in a
mismerge (commit 5e7f20d1cf7ac8049e70f38cfc53c1b9ffd2ce4e)

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
Linux Kernel Source Tree.