Merge branch 'libdrm-2_3-branch' of git://anongit.freedesktop.org/git/mesa/drm...

Merge branch 'libdrm-2_3-branch' of git://anongit.freedesktop.org/git/mesa/drm into debian-experimental

Conflicts:

	bsd-core/Makefile
	bsd-core/ati_pcigart.c
	bsd-core/drmP.h
	bsd-core/drm_agpsupport.c
	bsd-core/drm_auth.c
	bsd-core/drm_bufs.c
	bsd-core/drm_context.c
	bsd-core/drm_dma.c
	bsd-core/drm_drawable.c
	bsd-core/drm_drv.c
	bsd-core/drm_fops.c
	bsd-core/drm_ioctl.c
	bsd-core/drm_irq.c
	bsd-core/drm_lock.c
	bsd-core/drm_memory.c
	bsd-core/drm_pci.c
	bsd-core/drm_scatter.c
	bsd-core/drm_sysctl.c
	bsd-core/drm_vm.c
	bsd-core/i915_drv.c
	bsd-core/mach64_drv.c
	bsd-core/mga_drv.c
	bsd-core/r128_drv.c
	bsd-core/radeon_drv.c
	bsd-core/savage_drv.c
	bsd-core/sis_drv.c
	bsd-core/tdfx_drv.c
	bsd-core/via_drv.c
	linux-core/Kconfig
	linux-core/Makefile
	linux-core/Makefile.kernel
	linux-core/README.drm
	linux-core/ati_pcigart.c
	linux-core/drmP.h
	linux-core/drm_agpsupport.c
	linux-core/drm_auth.c
	linux-core/drm_bo.c
	linux-core/drm_bufs.c
	linux-core/drm_compat.c
	linux-core/drm_compat.h
	linux-core/drm_context.c
	linux-core/drm_dma.c
	linux-core/drm_drv.c
	linux-core/drm_fence.c
	linux-core/drm_fops.c
	linux-core/drm_hashtab.c
	linux-core/drm_hashtab.h
	linux-core/drm_ioc32.c
	linux-core/drm_ioctl.c
	linux-core/drm_irq.c
	linux-core/drm_lock.c
	linux-core/drm_memory.c
	linux-core/drm_memory.h
	linux-core/drm_memory_debug.c
	linux-core/drm_memory_debug.h
	linux-core/drm_mm.c
	linux-core/drm_object.c
	linux-core/drm_os_linux.h
	linux-core/drm_pci.c
	linux-core/drm_proc.c
	linux-core/drm_scatter.c
	linux-core/drm_sman.c
	linux-core/drm_sman.h
	linux-core/drm_stub.c
	linux-core/drm_sysfs.c
	linux-core/drm_ttm.c
	linux-core/drm_vm.c
	linux-core/ffb_context.c
	linux-core/ffb_drv.c
	linux-core/ffb_drv.h
	linux-core/i810_dma.c
	linux-core/i810_drm.h
	linux-core/i810_drv.h
	linux-core/i915_buffer.c
	linux-core/i915_drv.c
	linux-core/i915_fence.c
	linux-core/i915_ioc32.c
	linux-core/mach64_drv.c
	linux-core/mga_drv.c
	linux-core/mga_ioc32.c
	linux-core/r128_drv.c
	linux-core/r128_ioc32.c
	linux-core/radeon_drv.c
	linux-core/radeon_ioc32.c
	linux-core/sis_drv.c
	linux-core/sis_mm.c
	linux-core/via_dmablit.c
	linux-core/via_dmablit.h
	linux-core/via_mm.c
	scripts/create_lk_drm.sh