Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Jun 2009 16:39:40 +0000 (09:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Jun 2009 16:39:40 +0000 (09:39 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: misc small cleanups
  amd64_edac: fix ecc_enable_override handling
  amd64_edac: check only ECC bit in amd64_determine_edac_cap


Trivial merge