Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 16 Nov 2012 00:00:24 +0000 (10:00 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 16 Nov 2012 00:00:24 +0000 (10:00 +1000)
Just a single radeon fix from Alex.

* 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix logic error in atombios_encoders.c


Trivial merge