diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-24 19:57:15 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-24 19:57:15 +0200 |
commit | 2ecedc478e7a20597d95f48144cbe5ee568c0f1b (patch) | |
tree | 360c2cf63478a62e5a7ee310fd060e721894e1e7 /arch/arm/mach-imx/pm-imx27.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
parent | drm: drop comment about this header being autogenerated. (diff) | |
download | linux-2ecedc478e7a20597d95f48144cbe5ee568c0f1b.tar.xz linux-2ecedc478e7a20597d95f48144cbe5ee568c0f1b.zip |
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
Diffstat (limited to 'arch/arm/mach-imx/pm-imx27.c')
0 files changed, 0 insertions, 0 deletions