From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Dec 2013 17:37:17 +0000 (-0800)
Subject: Merge tag 'edac_fixes_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.13-rc4~8
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=0925f2cdf9d11fb24130d00d6bbea84502610535;p=cascardo%2Flinux.git

Merge tag 'edac_fixes_for_3.13' of git://git./linux/kernel/git/bp/bp

Pull EDAC fix from Borislav Petkov:
 "Silence a compiler warning in sb_edac"

* tag 'edac_fixes_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  sb_edac: Shut up compiler warning when EDAC_DEBUG is enabled
---

0925f2cdf9d11fb24130d00d6bbea84502610535