Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: fix bus endianity in file2alias
  HID: move tmff and zpff devices from ignore_list to blacklist
  HID: unlock properly on error paths in hidraw_ioctl()
  HID: blacklist Powercom USB UPS

...

This commit is contained in:

Linus Torvalds 2009-02-17 14:08:26 -08:00

parent 7f302fe317 2b639386a2

commit 5e51d16dde

4 changed files with 20 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

drivers/hid/hid-core.c

View file

3

drivers/hid/hid-ids.h

View file

14

drivers/hid/hidraw.c

View file

1

scripts/mod/file2alias.c

View file