tree 462f63307118b95c8cbacee6954e4d09ee85b8d1
parent 8127f4e883666c9960cfa89cffd36313748f8bab
parent 1a45dcfe2525e9432cb4aba461d4994fc2befe42
author Jiri Kosina <jkosina@suse.cz> 1265148639 +0100
committer Jiri Kosina <jkosina@suse.cz> 1265148639 +0100

Merge branch 'master' into upstream

Conflicts:
	drivers/hid/hid-ids.h