From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 May 2013 17:11:08 +0000 (-0700)
Subject: Merge tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~12539
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7462543abb87f55b530dfbb8d857645f1cebd756;p=mirror_ubuntu-artful-kernel.git

Merge tag 'edac_fixes_for_3.10' of git://git.kernel.org/pub/scm/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
---

7462543abb87f55b530dfbb8d857645f1cebd756