git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	4f36e6943600b0a8d1caa4c83b457006d5436683
tree	7b6a11844e00b3f4bf8281c7a799e61494220819	tree \| snapshot
parent	da6126c2078cd69f87be0a2170ebd7cd523716e1	commit \| diff
parent	a1a37591cc919ba6ba667fbded7e925c8e4135c6	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/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

Linux Kernel Source Tree.

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