]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote branch 'origin/master' of ../linux-2.6 into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 8 Sep 2009 04:49:32 +0000 (14:49 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 8 Sep 2009 04:49:32 +0000 (14:49 +1000)
commitced5a33f956a6a827d258899a3e84869a34ab98b
treece46a55f673cd2e669e9ccf625e6101a52138624
parent73ee71932fccd1e54598d62fafabbff24b3319fa
parentfb6ecacf17ab715c59448f12a0a63a0201f23b30
Merge remote branch 'origin/master' of ../linux-2.6 into drm-next

This was a non-trivial merge with some patches sent to Linus
in drm-fixes.

Conflicts:
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/radeon_asic.h
drivers/gpu/drm/radeon/rs600.c
drivers/gpu/drm/radeon/rs690.c
drivers/gpu/drm/radeon/rv515.c