From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Aug 2014 23:56:45 +0000 (-0600)
Subject: Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v4.14-rc1~6998
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=68ffeca4f40dcdfc04e7134b4667e268af6c0683;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'linux_next' of git://git./linux/kernel/git/mchehab/linux-edac

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
---

68ffeca4f40dcdfc04e7134b4667e268af6c0683