git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

projects / mirror_ubuntu-disco-kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f6f1242 1bcc206)

author	Jiri Kosina <jkosina@suse.cz>
	Tue, 25 Oct 2011 07:59:04 +0000 (09:59 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 25 Oct 2011 07:59:04 +0000 (09:59 +0200)
commit	b3aec7b686329e6bb65aa08c7f9458f7fd512f06
tree	67ae55567b5747f32ddd76dd63621bd2ca756a88	tree
parent	f6f12427844516bc8e9cf84f43aca7bbbaa48157	commit \| diff
parent	1bcc20675a1ac1ba47eaa201e02a89b0508e17b2	commit \| diff

Merge branch 'upstream' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

drivers/hid/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-apple.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hidraw.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/usbhid/hid-quirks.c	diff1 \|	diff2 \|	blob \| history
include/linux/hid.h	diff1 \|	diff2 \|	blob \| history

Ubuntu Disco kernel mirror for Proxmox VE and PMG