1. 16 Aug, 2014 38 commits
  2. 15 Aug, 2014 2 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · d22af68b
      Linus Torvalds authored
      Pull drm fixes (mostly nouveau) from Dave Airlie:
       "One doc buidling fixes for a file that moved, along with a bunch of
        nouveau fixes, one a build problem on ARM"
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/doc: Refer to proper source file
        drm/nouveau/platform: fix compilation error
        drm/nouveau/gk20a: add LTC device
        drm/nouveau: warn if we fail to re-pin fb on resume
        drm/nouveau/nvif: fix dac load detect method definition
        drm/gf100-/gr: fix -ENOSPC detection when allocating zbc table entries
        drm/nouveau/nvif: return null pointers on failure, in addition to ret != 0
        drm/nouveau/ltc: fix tag base address getting truncated if above 4GiB
        drm/nvc0-/fb/ram: fix use of non-existant ram if partitions aren't uniform
        drm/nouveau/bar: behave better if ioremap failed
        drm/nouveau/kms: nouveau_fbcon_accel_fini can be static
        drm/nouveau: kill unused variable warning if !__OS_HAS_AGP
        drm/nouveau/nvif: fix a number of notify thinkos
    • Linus Torvalds's avatar
      Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · 68ffeca4
      Linus Torvalds authored
      Pull EDAC updates from Mauro Carvalho Chehab.
      * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
        sb_edac: add support for Haswell based systems
        sb_edac: Fix mix tab/spaces alignments
        edac: add DDR4 and RDDR4
        sb_edac: remove bogus assumption on mc ordering
        sb_edac: make minimal use of channel_mask
        sb_edac: fix socket detection on Ivy Bridge controllers
        sb_edac: update Kconfig description
        sb_edac: search devices using product id
        sb_edac: make RIR limit retrieval per model
        sb_edac: make node id retrieval per model
        sb_edac: make memory type detection per memory controller