[git pull] drm fixes

[Dave Airlie]

On Thu, Jun 6, 2013 at 3:22 PM, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
> On Thu, Jun 6, 2013 at 2:14 PM, Dave Airlie <airlied at linux.ie> wrote:
>>
>>  7 files changed, 32 insertions(+), 42 deletions(-)
>
> That's not at all what I get (including shortlog). I got
>
>  29 files changed, 188 insertions(+), 68 deletions(-)
>
> from a lot of commits you don't list.

doh I slurped in the wrong file to my emailer.

Will resend.

Sorry,
Dave.