git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: aa13715 86e81f0)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 2 Aug 2013 04:33:36 +0000 (14:33 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 2 Aug 2013 04:33:36 +0000 (14:33 +1000)
commit	748966c9abfc55a94546d59a6c2a35a91817b9b5
tree	dde9ebec0e8d0cf38d295817a73806352fb1a6ac	tree \| snapshot
parent	aa13715c1e624671395b4035b61a7148a06c736a	commit \| diff
parent	86e81f0e624b55fa9f1560c3b64bc80e458c5168	commit \| diff

Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/qxl/qxl_release.c

16 files changed:

drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lvds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_drm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_object.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_release.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/si.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules