]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/actbl.h
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d62b489 a937536)
Merge tag 'v3.9-rc3' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 19 Mar 2013 08:47:30 +0000 (09:47 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 19 Mar 2013 08:47:30 +0000 (09:47 +0100)
commit0d4a42f6bd298e826620585e766a154ab460617a
tree406d8f7778691d858dbe3e48e4bbb10e99c0a58atree | snapshot
parentd62b4892f3d9f7dd2002e5309be10719d6805b0fcommit | diff
parenta937536b868b8369b98967929045f1df54234323commit | diff
Merge tag 'v3.9-rc3' into drm-intel-next-queued

Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in

commit a321e91b6d73ed011ffceed384c40d2785cf723b
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 27 17:02:56 2013 -0800

    lib/scatterlist: add simple page iterator

The merge itself is just two trivial conflicts:

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
16 files changed:
drivers/gpu/drm/i915/i915_debugfs.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_irq.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_reg.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_ddi.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_display.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_dp.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_drv.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_fb.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_hdmi.c 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/i915/intel_sdvo.c diff1 | diff2 | blob | history
drivers/video/fbmem.c diff1 | diff2 | blob | history
include/linux/pm.h diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules