[git pull] drm fixes

[Linus Torvalds]

On Mon, Apr 4, 2011 at 6:02 PM, Keith Packard <keithp at keithp.com> wrote:
> On Tue, 5 Apr 2011 01:38:31 +0100 (IST), Dave Airlie <airlied at linux.ie> wrote:
>
>>       drm/i915: Reset GMBUS controller after NAK
>
> We've got a report of a regression from this patch and have a fix in
> review right now. Please don't merge this to master until that fix has
> been verified and added to this sequence.

Gaah. Too late. I had already pulled and pushed out.

I'm not doing an -rc2 until tomorrow, though, so hopefully the issue
will be resolved and a fix pushed to me by then.

                        Linus