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)
commit14ef2b0c026558d37662e5e095d59c64597d5769
tree230c09cc65bc94384c687fed87e6ada954f80609
parent57ab12e418ec4fe24c11788bb1bbdabb29d05679
parent71b38bd4c1cc4f2b653064357e4efab77dfd711d
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus

Conflicts:
drivers/hid/Kconfig
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-sony.c
drivers/hid/usbhid/hid-core.c
include/linux/hid.h