]> err.no Git - linux-2.6/commitdiff
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor_core@ameritech.net>
Tue, 14 Mar 2006 04:36:52 +0000 (23:36 -0500)
committerDmitry Torokhov <dtor_core@ameritech.net>
Tue, 14 Mar 2006 04:36:52 +0000 (23:36 -0500)
1  2 
drivers/input/mouse/psmouse-base.c

Simple merge