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)
commit58a343f22e8ef987b90e34bbef7f1455e3bb5a15
treefc811fb570639f2083df6d9191b6a8d7cff65352
parent51c38f9bce274a1e8a90aa457fb433be738f7458
parent3759fa9c55923f719ae944a3f8fbb029b36f759d
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
drivers/input/mouse/psmouse-base.c