| commit | ed42350e02bfcb333024949e9653d06916135cc5 | |
| author | Jiri Kosina <jkosina@suse.cz> | |
| Sun, 4 Jan 2009 00:04:09 +0000 (4 01:04 +0100) | ||
| committer | Jiri Kosina <jkosina@suse.cz> | |
| Sun, 4 Jan 2009 00:04:09 +0000 (4 01:04 +0100) | ||
| tree | 08e2ff6c3cb90193677e67b1f23b85d1ba775f74 | treesnapshot (tar.gz zip) |
| parent | 1db489b2953799d41098a891c85dea02e3c4721a | commitdiff |
| parent | 4dfdc46468a142216b284eea66040f49df3f7191 | commitdiff |
Merge branch 'upstream-fixes' into for-next
Conflicts:
drivers/hid/hid-ids.h
Conflicts:
drivers/hid/hid-ids.h
| drivers/hid/hid-core.c | diff1 | diff2 | blobhistory |
| drivers/hid/hid-ids.h | diff1 | diff2 | blobhistory |
| drivers/hid/hidraw.c | diff1 | diff2 | blobhistory |