From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Mar 2013 19:44:22 +0000 (-0700)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
X-Git-Tag: firefly_0821_release~3680^2~861
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1e0695cbc814c718763ed93f20711b12c46cfa40;p=firefly-linux-kernel-4.4.55.git

Merge tag 'for_linus' of git://git./linux/kernel/git/bp/bp

Pull EDAC fixes from Borislav Petkov:
 "A fix from Mauro to correct csrow size accounting in sysfs and a
  sparse fix from Stephen Hemminger."

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Merge mci.mem_is_per_rank with mci.csbased
  amd64_edac: Correct DIMM sizes
  EDAC: Make sysfs functions static
---

1e0695cbc814c718763ed93f20711b12c46cfa40