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)
commit555bdaefd52c386e79f98591810ceb8bab780398
tree3a17d5adc23b6a183d9009f0072519129de3e075
parent1bfe4eefe530f97c1625982d754908f33acf308d
parent5989f11ba11c72f98d57580b991418d9ff6a207d
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:
  EDAC: Fix typos in Documentation/edac.txt
  EDAC, MCE: Fix edac_init_mce_inject error handling
  EDAC: Remove deprecated kbuild goal definitions