Merge tag 'edac_fixes_for_3.13' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Dec 2013 17:37:17 +0000 (09:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Dec 2013 17:37:17 +0000 (09:37 -0800)
commit0925f2cdf9d11fb24130d00d6bbea84502610535
treeb1ba046d44cdb53c720ee3a4001adfa2d293105e
parentb2077ebc19a4792d1b4749ab9fe013c893588989
parentbd4b9683623d0d91e87cf22f09008c05f56d7483
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