Merge branch 'cando' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:09:31 +0000 (14:09 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:09:31 +0000 (14:09 +0200)
commit896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68
tree42f625d04b9fbff4cb93968f18efd91601df15a5
parentef77ad5e67447b3744574c29b97da6677d6d3f18
parentba4d8abb31def963f49b7c239a8acce57fe1d1cc
Merge branch 'cando' into for-linus

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