Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Nov 2010 22:10:44 +0000 (14:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Nov 2010 22:10:44 +0000 (14:10 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC: Fix typos in Documentation/edac.txt
  EDAC, MCE: Fix edac_init_mce_inject error handling
  EDAC: Remove deprecated kbuild goal definitions


Trivial merge