| commit | 59c8231089be96165735585694a801ae58ec6c95 | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Wed Dec 23 08:33:34 2015 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Wed Dec 23 08:33:34 2015 +0100 |
| tree | 41bd60a9aec5df20e07a81fbb526c8bc05e997fc | |
| parent | de5126cc3c0b0f291d08fa591dcdf237bc595a56 [diff] | |
| parent | 0fb0b822d157325b66c503d23332f64899bfb828 [diff] |
Merge branch 'for-linus' into for-next Conflicts: drivers/gpu/drm/i915/intel_pm.c