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)
commit3697fd50a561f3b0ddcd1404edb7b81cb696e5e0
tree192bbf503d948d6ba827c1d460eee6e8af06d3ca
parent55aa914e9274cf1d55397cc04eb926eb055c79f7
parentb9196395c905edec512dfd6690428084228c16ec
Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

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