tree 1c515a34a60f65cbfd3cf1a387427d0a9fdf878f
parent 103a196f4224dc6872081305cf7f82ebf67aa7bd
parent 46557bef3f3834ac33031c7be27d39d90d507442
author Eric Anholt <eric@anholt.net> 1259686914 -0800
committer Eric Anholt <eric@anholt.net> 1259686914 -0800

Merge remote branch 'airlied/drm-next' into drm-intel-next