commit | 66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e | [log] [tgz] |
---|---|---|
author | Jiri Kosina <jkosina@suse.cz> | Mon Aug 27 08:04:24 2012 -0700 |
committer | Jiri Kosina <jkosina@suse.cz> | Mon Aug 27 08:05:17 2012 -0700 |
tree | 28ebaaee56786cd9199e0e5802d166474d30d1e3 | |
parent | 8db089d1b08209c04cd130e49fa4796b5513ce7f [diff] | |
parent | d37e44969e60dc652fdbaf4397d5436e07c967af [diff] |
Merge branch 'master' into upstream Sync with Linus' tree so that we don't have build falures due to Quanta 3001 ID reshuffling.