drivers/hid/Kconfig · 384703b8e6cd4c8ef08512e596024e028c91c339 · CM-Shield / android_kernel_asus_tf701t · GitLab

Oct 25, 2011
b3aec7b6
Merge branch 'upstream' into for-linus · b3aec7b6
Jiri Kosina authored Oct 25, 2011
```
Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h
```
b3aec7b6
Merge branch 'upstream' into for-linus
Jiri Kosina authored Oct 25, 2011
```
Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h
```