git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

author	Dave Airlie <airlied@redhat.com>
	Mon, 27 Aug 2012 06:22:20 +0000 (16:22 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Mon, 27 Aug 2012 06:22:20 +0000 (16:22 +1000)
commit	93bb70e0c00f1be4cc857e4d8375c44058cce71e
tree	7b6a11844e00b3f4bf8281c7a799e61494220819	tree
parent	6f314ebbaa2667d67a7206ba78f28e46cf47eda5	commit \| diff
parent	c182ae42cc3611f7b3fa803c0bcab6e5d29bea63	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into drm-next

There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

drivers/gpu/drm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_crt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_modes.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_crtc.h	diff1 \|	diff2 \|	blob \| history