| commit | 66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e | |
| author | Jiri Kosina <jkosina@suse.cz> | |
| Mon, 27 Aug 2012 15:04:24 +0000 (27 08:04 -0700) | ||
| committer | Jiri Kosina <jkosina@suse.cz> | |
| Mon, 27 Aug 2012 15:05:17 +0000 (27 08:05 -0700) | ||
| tree | 28ebaaee56786cd9199e0e5802d166474d30d1e3 | treesnapshot (tar.gz zip) |
| parent | 8db089d1b08209c04cd130e49fa4796b5513ce7f | commitdiff |
| parent | d37e44969e60dc652fdbaf4397d5436e07c967af | commitdiff |
Merge branch 'master' into upstream
Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
| drivers/hid/hid-core.c | diff1 | diff2 | blobhistory |
| drivers/hid/hid-ids.h | diff1 | diff2 | blobhistory |