git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d00f953 98dd588)

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	7f3703e1c9bd738728058b3c34f5408a0a65a328
tree	67ae55567b5747f32ddd76dd63621bd2ca756a88	tree \| snapshot
parent	d00f9535eece70c18906bf6671c67b386c0f6293	commit \| diff
parent	98dd5887e5e2a6d070f9adeaf3bc0a9f69e8fcaa	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

Linux Kernel Source Tree.