From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Jan 2012 04:48:42 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.3-rc1~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2145199c4f0db7c517dd788abec301dc84b91bd0;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  dma-buf: Documentation update for Kconfig select
  nouveau: Support Optimus models for vga_switcheroo
  nouveau: properly check for _DSM function support
  dma-buf: drop option text so users don't select it.
  radeon: Call pci_clear_master() instead of open-coding it.
  gma500: Discard modes that don't fit in stolen memory
  drm: bump DRM_CONNECTOR_MAX_ENCODER from 2 to 3
  drm/radeon/kms: Fix module parameter description format
  drm/radeon/kms/ni: fix packet2 handling for VM IB parser
  ttm/dma: Remove the WARN() which is not useful.
---

2145199c4f0db7c517dd788abec301dc84b91bd0