Merge branches 'upstream' and 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:44:36 +0000 (22:44 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:44:36 +0000 (22:44 +0200)
commitc3d9d74336c10c133ed062a1d778d457c6a46422
tree3763bf5b68feca1088c5a87c6bdb23b14c42b736
parent35da7a307c535f9c2929cae277f3df425c9f9b1e
parent569b10a506c4d5bc7398d040930539d84d3a2186
parentcb174681a9ececa6702f114b85bdf82144b6a5af
Merge branches 'upstream' and 'upstream-fixes' into for-linus
drivers/hid/hid-core.c
drivers/hid/hid-debug.c
drivers/hid/hid-ids.h
drivers/hid/hidraw.c
drivers/hid/usbhid/hid-quirks.c
drivers/hid/usbhid/hiddev.c