]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 25 Oct 2011 07:59:04 +0000 (09:59 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 25 Oct 2011 07:59:04 +0000 (09:59 +0200)
commitb3aec7b686329e6bb65aa08c7f9458f7fd512f06
tree67ae55567b5747f32ddd76dd63621bd2ca756a88
parentf6f12427844516bc8e9cf84f43aca7bbbaa48157
parent1bcc20675a1ac1ba47eaa201e02a89b0508e17b2
Merge branch 'upstream' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hidraw.c
drivers/hid/usbhid/hid-quirks.c
include/linux/hid.h