Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:31:13 +0000 (15:31 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:31:13 +0000 (15:31 +0200)
commitada8c7973b65865cf0436b73898e32992860012a
treedad7fb8494a0e4ea4734ed1d25c876205c6701c3
parent35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd
parent7d876c05fa6cf82f0274f27276d981ed325697a5
parent0b3fa399bef02f3658295f8dd334fc26a59c3a95
parent70c7c9c4438fc3ca573744c5448df90dbcc5e159
Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus

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