| commit | ed42350e02bfcb333024949e9653d06916135cc5 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Sun Jan 04 01:04:09 2009 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Sun Jan 04 01:04:09 2009 +0100 |
| tree | 08e2ff6c3cb90193677e67b1f23b85d1ba775f74 | |
| parent | 1db489b2953799d41098a891c85dea02e3c4721a [diff] | |
| parent | 4dfdc46468a142216b284eea66040f49df3f7191 [diff] |
Merge branch 'upstream-fixes' into for-next Conflicts: drivers/hid/hid-ids.h