git.ipfire.org Git - people/ms/linux.git/commit

]> git.ipfire.org Git - people/ms/linux.git/commit

projects / people / ms / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ef77ad5 ba4d8ab)

author	Jiri Kosina <jkosina@suse.cz>
	Wed, 19 May 2010 12:09:31 +0000 (14:09 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 19 May 2010 12:09:31 +0000 (14:09 +0200)
commit	896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68
tree	42f625d04b9fbff4cb93968f18efd91601df15a5	tree \| snapshot
parent	ef77ad5e67447b3744574c29b97da6677d6d3f18	commit \| diff
parent	ba4d8abb31def963f49b7c239a8acce57fe1d1cc	commit \| diff

Merge branch 'cando' 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-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history

Michael's Linux tree.