tree 67ae55567b5747f32ddd76dd63621bd2ca756a88
parent f6f12427844516bc8e9cf84f43aca7bbbaa48157
parent 1bcc20675a1ac1ba47eaa201e02a89b0508e17b2
author Jiri Kosina <jkosina@suse.cz> 1319529544 +0200
committer Jiri Kosina <jkosina@suse.cz> 1319529544 +0200

Merge branch 'upstream' into for-linus

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