tree 360c2cf63478a62e5a7ee310fd060e721894e1e7
parent 002b758b6dc4d840e662f25625f696d7b43d48f4
parent 59bbe27ba0f6bae1d85f1521e43181d98ee9c5ab
author Linus Torvalds <torvalds@linux-foundation.org> 1340560635 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1340560635 -0700

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

Pull drm fixes from Dave Airlie:
 "Nothing major in here, one radeon SI fix for tiling, and one uninit
  var fix, two minor header file fixes."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm: drop comment about this header being autogenerated.
  drm/edid: don't return stack garbage from supports_rb
  vga_switcheroo: Add include guard
  drm/radeon: SI tiling fixes for display