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


Trivial merge