tree dad7fb8494a0e4ea4734ed1d25c876205c6701c3
parent 35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd
parent 7d876c05fa6cf82f0274f27276d981ed325697a5
parent 0b3fa399bef02f3658295f8dd334fc26a59c3a95
parent 70c7c9c4438fc3ca573744c5448df90dbcc5e159
author Jiri Kosina <jkosina@suse.cz> 1280928673 +0200
committer Jiri Kosina <jkosina@suse.cz> 1280928673 +0200

Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus

Conflicts:
	drivers/hid/hid-ids.h