Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
commit52e4c2a05256cb83cda12f3c2137ab1533344edb
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Nov 2011 19:09:55 +0000 (13 17:09 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Nov 2011 19:09:55 +0000 (13 17:09 -0200)
tree91969f8c2c0c9dc0585cd264f5d5b441af70676a
parent3439a8da16bcad6b0982ece938c9f8299bb53584
parenta7c36fd8c5ee6dcca584137cb81aeefd785a0721
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms/combios: fix dynamic allocation of PM clock modes