]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Mar 2013 19:44:22 +0000 (12:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Mar 2013 19:44:22 +0000 (12:44 -0700)
commit97c95af53d0cd5d790869672e5de265a264a575a
treea367fd984ddb5c12e80f8dfd9a41f385d7a19a97
parent1e51fb6012a14c5e3076472dbaf9fcee7ac5c858
parentbcd0fd886856fe793bb76a5bf6f691e6253df220
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/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