Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into...
authorJiri Kosina <jkosina@suse.cz>
Thu, 25 Feb 2010 16:39:16 +0000 (17:39 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 25 Feb 2010 16:39:16 +0000 (17:39 +0100)
Conflicts:
drivers/hid/Kconfig


Trivial merge