1. 13 6月, 2013 2 次提交
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 1a9c3d68
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "Resurrect Alchemy platforms by invoking the WAIT instructions with
        interrupts enabled.  This still leaves the race condition between
        testing TIF_NEED_RESCHED and the WAIT instruction for Alchemy
        platforms which need a different fix than other MIPS platforms.  But
        at least it gets MIPS platforms flying again.
      
        There are also fixes for two build errors (CONFIG_FTRACE=y with
        CONFIG_DYNAMIC_FTRACE=n) and CONFIG_VIRTUALIZATION without CONFIG_KVM"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: ftrace: Add missing CONFIG_DYNAMIC_FTRACE
        MIPS: include: mmu_context.h: Replace VIRTUALIZATION with KVM
        MIPS: Alchemy: fix wait function
      1a9c3d68
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 6673de0e
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Just some GMA500 memory leaks and i915 regression fix due to a
        regression fix"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/i915: prefer VBT modes for SVDO-LVDS over EDID
        drm/i915: Enable hotplug interrupts after querying hw capabilities.
        drm/i915: Fix hotplug interrupt enabling for SDVOC
        drm/gma500/cdv: Fix cursor gem obj referencing on cdv
        drm/gma500/psb: Fix cursor gem obj referencing on psb
        drm/gma500/cdv: Unpin framebuffer on crtc disable
        drm/gma500/psb: Unpin framebuffer on crtc disable
        drm/gma500: Add fb gtt offset to fb base
      6673de0e
  2. 12 6月, 2013 5 次提交
  3. 11 6月, 2013 16 次提交
  4. 10 6月, 2013 17 次提交