| commit | 6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed May 18 17:06:31 2011 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed May 18 17:06:49 2011 +0200 |
| tree | f2f77cc31b4548745778fca6a51b09e1d8a49804 | |
| parent | b50f315cbb865079a16a12fd9ae6083f98fd592c [diff] | |
| parent | c1d10d18c542278b7fbc413c289d3cb6219da6b3 [diff] |
Merge branch 'master' into upstream. This is sync with Linus' tree to receive KEY_IMAGES definition that went in through input tree.