apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus

Browse Source 
Conflicts:
	drivers/hid/hid-core.c
This commit is contained in:
Jiri Kosina
2013-02-21 10:45:52 +01:00
parent 73759518d6 99d249021a 7e41576247
commit 0d69a3c731
7 changed files with 469 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/hid/Makefile
+1
View File
@@ -101,6 +101,7 @@ obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o
obj-$(CONFIG_HID_SONY) += hid-sony.o
obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o
obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o
obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o
obj-$(CONFIG_HID_THINGM) += hid-thingm.o