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)
This merges Christian work that has been hanging around on the list.


Trivial merge