Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Mar 2010 17:25:37 +0000 (09:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Mar 2010 17:25:37 +0000 (09:25 -0800)
commiteaa5eec739637f32f8733d528ff0b94fd62b1214
treec9568668b920ad677b9a82be02e83b173d20c7d5
parent2a32f2db132264c356aea30a8270d3e68d96c509
parentd95cf4de6a1c9c1025ac375bc6d2da6af18fdf35
Merge branch 'for-linus' of git://git./linux/kernel/git/bp/bp

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: Simplify ECC override handling
drivers/edac/amd64_edac.c