| commit | e1a0bdd8022317e98650e70850de73eccfcde5ad | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue Feb 02 23:10:39 2010 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue Feb 02 23:10:39 2010 +0100 |
| tree | 462f63307118b95c8cbacee6954e4d09ee85b8d1 | |
| parent | 8127f4e883666c9960cfa89cffd36313748f8bab [diff] | |
| parent | 1a45dcfe2525e9432cb4aba461d4994fc2befe42 [diff] |
Merge branch 'master' into upstream Conflicts: drivers/hid/hid-ids.h