Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into for-linus

This commit is contained in:
Jiri Kosina 2010-10-23 22:47:38 +02:00
20 changed files with 1928 additions and 213 deletions