]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit85bd083d1c15ed2249abeec3fcc4fd2f86575279
tree230c09cc65bc94384c687fed87e6ada954f80609
parentdd530a9a5df11bf27a9b9ca06434a0eda606bd16
parente1fd06044040e6e52c441e2242dafda0aabbd063
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