Merge branch 'egalax' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:26:44 +0000 (14:26 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:26:44 +0000 (14:26 +0200)
commit77933c354c6c0e4b6abcb417518e84b8fd9b7ae4
treef05d0a426959ee01ce74c1f4733076d3b0ee4c8d
parent896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68
parentc872b0fccc6e086beea0a7b3b4123b7d0e75a868
Merge branch 'egalax' into for-linus

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