]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cbd5b3 fcc18e8)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor_core@ameritech.net>
Mon, 26 Jun 2006 05:31:38 +0000 (01:31 -0400)
committerDmitry Torokhov <dtor_core@ameritech.net>
Mon, 26 Jun 2006 05:31:38 +0000 (01:31 -0400)
1  2 
drivers/char/keyboard.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/keyboard.c
Simple merge
Linux 2.6 source tree