[git pull] drm fixes

From: Dave Airlie
Date: Sat Jun 23 2012 - 04:43:57 EST



Hi Linus,

Nothing major in here, one radeon SI fix for tiling, and one uninit var
fix, two minor header file fixes.

Dave.

The following changes since commit fb09185a88cad9c59e22e84f8c0594303595e9af:

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2012-06-17 01:44:41 -0700)

are available in the git repository at:


git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to 59bbe27ba0f6bae1d85f1521e43181d98ee9c5ab:

drm: drop comment about this header being autogenerated. (2012-06-22 11:04:55 +0100)

----------------------------------------------------------------
Alex Deucher (1):
drm/radeon: SI tiling fixes for display

Daniel Vetter (1):
drm/edid: don't return stack garbage from supports_rb

Dave Airlie (1):
drm: drop comment about this header being autogenerated.

Ozan ÃaÄlayan (1):
vga_switcheroo: Add include guard

drivers/gpu/drm/drm_edid.c | 2 +-
drivers/gpu/drm/radeon/atombios_crtc.c | 10 ++++-
drivers/gpu/drm/radeon/si_reg.h | 72 ++++++++++++++++++++++++++++++++
include/drm/drm_pciids.h | 4 --
include/linux/vga_switcheroo.h | 4 ++
5 files changed, 86 insertions(+), 6 deletions(-)