Jiri Kosina ed42350e02 Merge branch 'upstream-fixes' into for-next ...

Conflicts:

	drivers/hid/hid-ids.h

2009-01-04 01:04:09 +01:00

..

usbhid

Merge branch 'upstream-fixes' into for-next

2009-01-04 01:04:09 +01:00

hid-a4tech.c

…

hid-apple.c

…

hid-belkin.c

…

hid-cherry.c

…

hid-chicony.c

…

hid-core.c

Merge branch 'upstream-fixes' into for-next

2009-01-04 01:04:09 +01:00

hid-cypress.c

…

hid-debug.c

…

hid-dummy.c

…

hid-ezkey.c

…

hid-gaff.c

…

hid-gyration.c

…

hid-ids.h

Merge branch 'upstream-fixes' into for-next

2009-01-04 01:04:09 +01:00

hid-input.c

…

hid-lg2ff.c

…

hid-lg.c

…

hid-lg.h

…

hid-lgff.c

…

hid-microsoft.c

…

hid-monterey.c

…

hid-ntrig.c

…

hid-petalynx.c

…

hid-pl.c

…

hid-samsung.c

…

hid-sony.c

HID: fix error condition propagation in hid-sony driver

2009-01-04 01:01:43 +01:00

hid-sunplus.c

…

hid-tmff.c

…

hid-topseed.c

…

hid-zpff.c

…

hidraw.c

Merge branch 'upstream-fixes' into for-next

2009-01-04 01:04:09 +01:00

Kconfig

…

Makefile

…