summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 19:09:48 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 19:09:48 +0100
commitae5cfc0546ca2698b9dcddf72accbd70e57590a0 (patch)
treeeb0fcb5ed1dbfbfe7a3c8ac564a42144b5eed88b /drivers/gpu/drm/radeon
parentMerge branch 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff)
parentxen/mmu: Fix compile errors introduced by x86/memblock mismerge. (diff)
downloadlinux-ae5cfc0546ca2698b9dcddf72accbd70e57590a0.tar.xz
linux-ae5cfc0546ca2698b9dcddf72accbd70e57590a0.zip
Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/mmu: Fix compile errors introduced by x86/memblock mismerge.
Diffstat (limited to 'drivers/gpu/drm/radeon')
0 files changed, 0 insertions, 0 deletions