From: Linus Torvalds Date: Tue, 17 Feb 2009 22:08:26 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid X-Git-Tag: firefly_0821_release~15540 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5e51d16ddefa0874993f42a4b2beb13127feda76;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid * '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 --- 5e51d16ddefa0874993f42a4b2beb13127feda76