diff options
| author | Dmitry Torokhov | 2007-05-01 06:24:54 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2007-05-01 06:24:54 +0200 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /drivers/input/joydev.c | |
| parent | Input: cobalt_btns - convert to use polldev library (diff) | |
| parent | libata: honour host controllers that want just one host (diff) | |
| download | kernel-qcow2-linux-bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775.tar.gz kernel-qcow2-linux-bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775.tar.xz kernel-qcow2-linux-bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'drivers/input/joydev.c')
0 files changed, 0 insertions, 0 deletions