diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-11 15:39:05 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-11 15:39:05 +0100 |
| commit | 2f2d27026c4728533d60ac0b7b98df18f6b2cd0c (patch) | |
| tree | 3c4e367bb569842a522827e75a25b918cae343b1 /drivers/gpu/drm/armada/armada_drv.c | |
| parent | 42e62ba7a484e12a77b9e330a29bbf7c99d3e60e (diff) | |
| parent | 7e435aad38083f378ba7889d8b8fdcdbfe7088e7 (diff) | |
| parent | b509cc802239a8b5ba7d1d2cc5adfb9d984b7ed8 (diff) | |
Merge branches 'drm-devel' and 'component-for-driver' into armada-drm