Merge branch 'uhid' into for-linus

Conflicts:
	drivers/hid/Kconfig
This commit is contained in:
Jiri Kosina
2012-07-24 13:40:06 +02:00
9 changed files with 1266 additions and 0 deletions
+1
View File
@@ -376,6 +376,7 @@ header-y += tty.h
header-y += types.h
header-y += udf_fs_i.h
header-y += udp.h
header-y += uhid.h
header-y += uinput.h
header-y += uio.h
header-y += ultrasound.h