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

Conflicts:

	drivers/hid/hid-ids.h

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

..

hid-core.c

HID: use GFP_KERNEL in hid_alloc_buffers

2009-01-04 01:00:52 +01:00

hid-pidff.c

HID: fix a lockup regression when using force feedback on a PID device

2008-10-14 23:51:02 +02:00

hid-quirks.c

HID: add proper support for pensketch 12x9 tablet

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

hiddev.c

HID: hiddev cleanup -- handle all error conditions properly

2009-01-04 01:00:53 +01:00

Kconfig

HID: make boot protocol drivers depend on EMBEDDED

2009-01-04 01:00:53 +01:00

Makefile

HID: remove hid-ff

2008-10-14 23:51:01 +02:00

usbhid.h

HID: move usbhid flags to usbhid.h

2009-01-04 01:00:51 +01:00

usbkbd.c

HID: remove warn() macro from usb hid drivers

2008-10-14 23:51:03 +02:00

usbmouse.c

HID: remove info() macro from usb HID drivers

2008-10-14 23:51:03 +02:00