| commit | 9929ffed889b4861b52ba648a44fa4add945c4d1 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed Aug 04 15:27:54 2010 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed Aug 04 15:27:54 2010 +0200 |
| tree | 3cca02ae6b6616cc9a204b762aab349fcfa3aefe | |
| parent | fc73697bd5bf4efe8b5b2b78ec09e00f967cd055 [diff] | |
| parent | d5e0a06f17a0ffb0eb08a5bd7b18f00af70d9a12 [diff] |
Merge branch 'upstream-fixes' into for-linus Conflicts: drivers/hid/hid-ids.h