Merge branch 'next' of git://people.freedesktop.org/~deathsimple/linux into drm-next
authorDave Airlie <airlied@gmail.com>
Tue, 17 Jul 2012 09:46:49 +0000 (19:46 +1000)
committerDave Airlie <airlied@gmail.com>
Tue, 17 Jul 2012 09:46:49 +0000 (19:46 +1000)
commitfaadaf97e5314d7463e7a815445d2f9166934ad4
treee3d5cbf795627b10ea12f337c8c1c8cfb294a699
parent6b9d89b4365ab52bc26f8259122f422e93d87821
parent55d7c22192becd0ec827a6901899ff56fa985658
Merge branch 'next' of git://people.freedesktop.org/~deathsimple/linux into drm-next

This merges Christian work that has been hanging around on the list.