Merge branches 'drm-3.12' and 'tda998x-3.12' into drm-tda998x-3.12
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 18 Oct 2013 15:00:02 +0000 (16:00 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 18 Oct 2013 15:00:02 +0000 (16:00 +0100)
commitdfdba7fd60592818078e9ceec04ffa49347e1aed
treed3029559a75416f6fde5f3cfc177cb9cef1ead93
parent662af0d8228ced3c7b3d3012a73dce929fc27574
parent893c3e538dc338509b0c1121173355e8cfa34ff0
Merge branches 'drm-3.12' and 'tda998x-3.12' into drm-tda998x-3.12