projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 51f0885 9713fae)
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Mar 2013 19:44:22 +0000 (12:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Mar 2013 19:44:22 +0000 (12:44 -0700)
commit1e0695cbc814c718763ed93f20711b12c46cfa40
treea367fd984ddb5c12e80f8dfd9a41f385d7a19a97tree | snapshot
parent51f0885e5415b4cc6535e9cdcc5145bfbc134353commit | diff
parent9713faecff3d071de1208b081d4943b002e9cb1ccommit | diff
Merge tag 'for_linus' of git://git./linux/kernel/git/bp/bp

Pull EDAC fixes from Borislav Petkov:
 "A fix from Mauro to correct csrow size accounting in sysfs and a
  sparse fix from Stephen Hemminger."

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Merge mci.mem_is_per_rank with mci.csbased
  amd64_edac: Correct DIMM sizes
  EDAC: Make sysfs functions static
John Crispins staging tree