tree 230c09cc65bc94384c687fed87e6ada954f80609
parent 57ab12e418ec4fe24c11788bb1bbdabb29d05679
parent 71b38bd4c1cc4f2b653064357e4efab77dfd711d
author Jiri Kosina <jkosina@suse.cz> 1267115956 +0100
committer Jiri Kosina <jkosina@suse.cz> 1267115956 +0100

Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus

Conflicts:
	drivers/hid/Kconfig