| commit | dfdba7fd60592818078e9ceec04ffa49347e1aed | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Oct 18 16:00:02 2013 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Oct 18 16:00:02 2013 +0100 |
| tree | d3029559a75416f6fde5f3cfc177cb9cef1ead93 | |
| parent | 662af0d8228ced3c7b3d3012a73dce929fc27574 [diff] | |
| parent | 893c3e538dc338509b0c1121173355e8cfa34ff0 [diff] |
Merge branches 'drm-3.12' and 'tda998x-3.12' into drm-tda998x-3.12