| commit | 14ef2b0c026558d37662e5e095d59c64597d5769 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Thu Feb 25 17:39:16 2010 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Thu Feb 25 17:39:16 2010 +0100 |
| tree | 230c09cc65bc94384c687fed87e6ada954f80609 | |
| parent | 57ab12e418ec4fe24c11788bb1bbdabb29d05679 [diff] | |
| parent | 71b38bd4c1cc4f2b653064357e4efab77dfd711d [diff] |
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus Conflicts: drivers/hid/Kconfig