| commit | 041387d98460b3947587929ef3a4773b8c48538f | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dtor_core@ameritech.net> | Tue Dec 20 23:03:50 2005 -0500 |
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | Tue Dec 20 23:03:50 2005 -0500 |
| tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed | |
| parent | 56f0356321a876a1a356712f2486d6188a3b4992 [diff] | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d [diff] |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)