diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
| commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
| tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /usr | |
| parent | 56f0356321a876a1a356712f2486d6188a3b4992 (diff) | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) | |
| download | op-kernel-dev-041387d98460b3947587929ef3a4773b8c48538f.zip op-kernel-dev-041387d98460b3947587929ef3a4773b8c48538f.tar.gz | |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions
