Hi Dave,

Today's linux-next merge of the drm tree got conflicts in
drivers/gpu/drm/radeon/r300.c, drivers/gpu/drm/radeon/rs600.c and
drivers/gpu/drm/radeon/rv515.c between commit
a54775c8758a754186bc6adbfc518b1e9f8f1e4e ("drm/radeon/kms: add LTE/GTE
discard + rv515 two sided stencil register") from Linus' tree and commits
50f153036c9d9e4ae1768d5ca9c2ad4184f7a0b7 ("drm/radeon/kms: generate the
safe register tables") and 3f7dc91adef90a20f806282724c40d68d5b020aa
("drm/rs600/690: use autogenerated safe register tables") from the drm
tree.

I just used the drm tree's versions.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/