Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Linus Torvalds [Wed, 3 Mar 2010 17:25:37 +0000 (09:25 -0800)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: Simplify ECC override handling

1  2 
drivers/edac/amd64_edac.c

Simple merge