Merge tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 17:11:08 +0000 (10:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 17:11:08 +0000 (10:11 -0700)
commit7462543abb87f55b530dfbb8d857645f1cebd756
treee8ab60ee5a12ae9ab18a02852e7facc0394279b3
parentbde9d73ddc85725ccdc9863b37acc0f03806b281
parentc8c64d165ccfd2274058ac84e0c680f9b48c4ec1
Merge tag 'edac_fixes_for_3.10' of git://git./linux/kernel/git/bp/bp

Pull two small EDAC fixes from Borislav Petkov.

* tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Don't give write permission to read-only files
  EDAC, mc_sysfs.c: Fix string array pointer types