diff options
| author | Dmitry Torokhov | 2005-12-21 05:03:50 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2005-12-21 05:03:50 +0100 |
| commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
| tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/usb/input/appletouch.c | |
| parent | Input: add the fn key to hid-debug.h (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.gz kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.xz kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.zip | |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'drivers/usb/input/appletouch.c')
0 files changed, 0 insertions, 0 deletions