tree 6981f5c7eda9fbc1cb4328e9756c5d89890ebf11
parent 6cf544377fd7ecc87561d8ef77f4bea10259f184
parent 5785e53ffa73f77fb19e378c899027afc07272bc
author Linus Torvalds <torvalds@linux-foundation.org> 1303263177 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1303263177 -0700

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: pll tweaks for r7xx
  drm/nouveau: fix allocation of notifier object
  drm/nouveau: fix notifier memory corruption bug
  drm/nouveau: fix pinning of notifier block
  drm/nouveau: populate ttm_alloced with false, when it's not
  drm/nouveau: fix nv30 pcie boards
  drm/nouveau: split ramin_lock into two locks, one hardirq safe
  drm/radeon/kms: adjust evergreen display watermark setup
  drm/radeon/kms: add connectors even if i2c fails
  drm/radeon/kms: fix bad shift in atom iio table parser