Jiri Kosina 14ef2b0c02 Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus ... Conflicts: drivers/hid/Kconfig		2010-02-25 17:39:16 +01:00
..
usbhid	Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus	2010-02-25 17:39:16 +01:00
hid-3m-pct.c
hid-a4tech.c
hid-apple.c
hid-belkin.c
hid-cherry.c
hid-chicony.c
hid-core.c	Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus	2010-02-25 17:39:16 +01:00
hid-cypress.c
hid-debug.c
hid-drff.c
hid-ezkey.c
hid-gaff.c
hid-gyration.c
hid-ids.h	Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus	2010-02-25 17:39:16 +01:00
hid-input.c
hid-kensington.c
hid-kye.c
hid-lg2ff.c
hid-lg3ff.c
hid-lg.c
hid-lg.h
hid-lgff.c
hid-magicmouse.c
hid-microsoft.c
hid-monterey.c
hid-mosart.c
hid-ntrig.c
hid-ortek.c
hid-petalynx.c
hid-pl.c
hid-quanta.c
hid-samsung.c
hid-sjoy.c
hid-sony.c	Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus	2010-02-25 17:39:16 +01:00
hid-stantum.c
hid-sunplus.c
hid-tmff.c
hid-topseed.c
hid-twinhan.c
hid-wacom.c
hid-zpff.c
hidraw.c
Kconfig	Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus	2010-02-25 17:39:16 +01:00
Makefile	Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus	2010-02-25 17:39:16 +01:00