Merge branches 'upstream' and 'upstream-fixes' into for-linus
commita7153258b70ccbe3922fcee9ca4271d4f4c2bc55
authorJiri Kosina <jkosina@suse.cz>
Sat, 8 Jan 2011 00:08:19 +0000 (8 01:08 +0100)
committerJiri Kosina <jkosina@suse.cz>
Sat, 8 Jan 2011 00:08:19 +0000 (8 01:08 +0100)
tree12e17027af36846933908da64a1419491ea58676
parentae5e49c79c051ea1d5ca91cbd4a0d22189067ba3
parent0fbf8ed976af5bb43cf9cf2492161eb9688fee0c
Merge branches 'upstream' and 'upstream-fixes' into for-linus
drivers/hid/hid-magicmouse.c
drivers/hid/hid-mosart.c
drivers/hid/hid-picolcd.c